Improved strhashcomp with no allocations

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

diff --git a/src/hashcomp.cpp b/src/hashcomp.cpp
index 150bf77fe56dc534bc2c030e8c8e9f84e7800ea8..10e1f331e485d1e192b3bb5baa5317af4355f46e 100644 (file)
--- a/src/hashcomp.cpp
+++ b/src/hashcomp.cpp
@@ -76,18 +76,21 @@ size_t nspace::hash<in_addr>::operator()(const struct in_addr &a) const
 
 size_t nspace::hash<string>::operator()(const string &s) const
 {
-        char a[MAXBUF];
-        static struct hash<const char *> strhash;
-        strlcpy(a,s.c_str(),MAXBUF);
-        strlower(a);
-        return strhash(a);
+       char a[MAXBUF];
+       static struct hash<const char *> strhash;
+       strlcpy(a,s.c_str(),MAXBUF);
+       strlower(a);
+       return strhash(a);
 }
 
 bool irc::StrHashComp::operator()(const std::string& s1, const std::string& s2) const
 {
-       irc::string a = s1.c_str();
-       irc::string b = s2.c_str();
-        return (a == b);
+       char* n1 = (char*)s1.c_str();
+       char* n2 = (char*)s2.c_str();
+       for (; *n1 && *n2; n1++, n2++)
+               if (lowertab[*n1] != lowertab[*n2])
+                       return false;
+       return (lowertab[*n1] == lowertab[*n2]);
 }
 
 bool irc::InAddr_HashComp::operator()(const in_addr &s1, const in_addr &s2) const
@@ -142,9 +145,43 @@ int irc::irc_char_traits::compare(const char* str1, const char* str2, size_t n)
        return 0;
 }
 
+std::string operator+ (std::string& leftval, irc::string& rightval)
+{
+       return leftval + std::string(rightval.c_str());
+}
+
+irc::string operator+ (irc::string& leftval, std::string& rightval)
+{
+       return leftval + irc::string(rightval.c_str());
+}
+
+bool operator== (std::string& leftval, irc::string& rightval)
+{
+       return (leftval == std::string(rightval.c_str()));
+}
+
+bool operator== (irc::string& leftval, std::string& rightval)
+{
+       return (rightval == std::string(leftval.c_str()));
+}
+
 const char* irc::irc_char_traits::find(const char* s1, int  n, char c)
 {
        while(n-- > 0 && lowermap[(unsigned)*s1] != lowermap[(unsigned)c])
                s1++;
        return s1;
 }
+
+/* See hashcomp.h if you care about these... */
+std::ostream& operator<<(std::ostream &os, const irc::string &str)
+{
+       return os << str.c_str();
+}
+
+std::istream& operator>>(std::istream &is, irc::string &str)
+{
+       std::string tmp;
+       is >> tmp;
+       str = tmp.c_str();
+       return is;
+}