summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2009-11-22 10:21:50 (GMT)
committerRemko Tronçon <git@el-tramo.be>2009-11-22 10:27:03 (GMT)
commit2df5e148de44c6c91c5a28d197b8b2b913ca80d4 (patch)
treea2cc5567d02660e13f881ec500757347e53d46a5 /Swiften/JID
parent4e244a9d1967ad416530aa3b9b07faad54097327 (diff)
downloadswift-2df5e148de44c6c91c5a28d197b8b2b913ca80d4.zip
swift-2df5e148de44c6c91c5a28d197b8b2b913ca80d4.tar.bz2
Moved stringprepping to a separate module.
Diffstat (limited to 'Swiften/JID')
-rw-r--r--Swiften/JID/JID.cpp38
1 files changed, 4 insertions, 34 deletions
diff --git a/Swiften/JID/JID.cpp b/Swiften/JID/JID.cpp
index dcd6dd1..3be8386 100644
--- a/Swiften/JID/JID.cpp
+++ b/Swiften/JID/JID.cpp
@@ -3,40 +3,10 @@
#include <iostream>
#include "Swiften/JID/JID.h"
+#include "Swiften/StringPrep/StringPrep.h"
namespace Swift {
-
-class StringPrepper {
- private:
- static const int MAX_STRINGPREP_SIZE = 1024;
-
- public:
- static String getNamePrepped(const String& name) {
- return getStringPrepped(name, stringprep_nameprep);
- }
-
- static String getNodePrepped(const String& node) {
- return getStringPrepped(node, stringprep_xmpp_nodeprep);
- }
-
- static String getResourcePrepped(const String& resource) {
- return getStringPrepped(resource, stringprep_xmpp_resourceprep);
- }
-
- static String getStringPrepped(const String& s, const Stringprep_profile profile[]) {
- std::vector<char> input(s.getUTF8String().begin(), s.getUTF8String().end());
- input.resize(MAX_STRINGPREP_SIZE);
- if (stringprep(&input[0], MAX_STRINGPREP_SIZE, static_cast<Stringprep_profile_flags>(0), profile) == 0) {
- return String(&input[0]);
- }
- else {
- return "";
- }
- }
-};
-
-
JID::JID(const char* jid) {
initializeFromString(String(jid));
}
@@ -80,9 +50,9 @@ void JID::initializeFromString(const String& jid) {
void JID::nameprepAndSetComponents(const String& node, const String& domain, const String& resource) {
- node_ = StringPrepper::getNamePrepped(node);
- domain_ = StringPrepper::getNodePrepped(domain);
- resource_ = StringPrepper::getResourcePrepped(resource);
+ node_ = StringPrep::getPrepared(node, StringPrep::NamePrep);
+ domain_ = StringPrep::getPrepared(domain, StringPrep::XMPPNodePrep);
+ resource_ = StringPrep::getPrepared(resource, StringPrep::XMPPResourcePrep);
}
String JID::toString() const {