Change all socketengine methods to be static

[user/henk/code/inspircd.git] / src / hashcomp.cpp

diff --git a/src/hashcomp.cpp b/src/hashcomp.cpp
index 4eb416406426331923693a5fff99072b73b40fb6..32f74475fd632e72ef222ff7967ff2ae7c95bc6e 100644 (file)
--- a/src/hashcomp.cpp
+++ b/src/hashcomp.cpp
@@ -170,6 +170,25 @@ bool irc::StrHashComp::operator()(const std::string& s1, const std::string& s2)
        return (national_case_insensitive_map[*n1] == national_case_insensitive_map[*n2]);
 }
 
+bool irc::insensitive_swo::operator()(const std::string& a, const std::string& b) const
+{
+       const unsigned char* charmap = national_case_insensitive_map;
+       std::string::size_type asize = a.size();
+       std::string::size_type bsize = b.size();
+       std::string::size_type maxsize = std::min(asize, bsize);
+
+       for (std::string::size_type i = 0; i < maxsize; i++)
+       {
+               unsigned char A = charmap[(unsigned char)a[i]];
+               unsigned char B = charmap[(unsigned char)b[i]];
+               if (A > B)
+                       return false;
+               else if (A < B)
+                       return true;
+       }
+       return (asize < bsize);
+}
+
 size_t irc::insensitive::operator()(const std::string &s) const
 {
        /* XXX: NO DATA COPIES! :)
@@ -395,14 +414,16 @@ int irc::modestacker::GetStackedLine(std::vector<std::string> &result, int max_l
        return n;
 }
 
-irc::stringjoiner::stringjoiner(const std::vector<std::string>& sequence)
+std::string irc::stringjoiner(const std::vector<std::string>& sequence, char separator)
 {
+       std::string joined;
        if (sequence.empty())
-               return; // nothing to do here
+               return joined; // nothing to do here
 
        for (std::vector<std::string>::const_iterator i = sequence.begin(); i != sequence.end(); ++i)
-               joined.append(*i).push_back(' ');
+               joined.append(*i).push_back(separator);
        joined.erase(joined.end()-1);
+       return joined;
 }
 
 irc::portparser::portparser(const std::string &source, bool allow_overlapped)