Improved strhashcomp with no allocations

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@3596 e03df62e-2008-0410-955e-edbf42e46eb7

diff --git a/src/hashcomp.cpp b/src/hashcomp.cpp
index e948134205827e3f2380189273ca311d2576a464..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

diff --git a/src/svn-rev.sh b/src/svn-rev.sh
index 8acb32dfb2aa6c9d280adeaa9514fcecdbd0ed17..74ad7dc660a6ef7cd2d406ba7535c24f29a1f4c0 100755 (executable)
--- a/src/svn-rev.sh
+++ b/src/svn-rev.sh
@@ -1 +1 @@
-echo 3593
+echo 3595