X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fhashcomp.cpp;h=10e1f331e485d1e192b3bb5baa5317af4355f46e;hb=bb81e1a5f38b1d6487e53aa5ac69ca7ced9f6562;hp=ee485591f9ba182ef5a93f0ddef505d42300c175;hpb=8942c3cd3217e5c68f01e3cb344709971921fc97;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/hashcomp.cpp b/src/hashcomp.cpp index ee485591f..10e1f331e 100644 --- a/src/hashcomp.cpp +++ b/src/hashcomp.cpp @@ -76,18 +76,21 @@ size_t nspace::hash::operator()(const struct in_addr &a) const size_t nspace::hash::operator()(const string &s) const { - char a[MAXBUF]; - static struct hash strhash; - strlcpy(a,s.c_str(),MAXBUF); - strlower(a); - return strhash(a); + char a[MAXBUF]; + static struct hash 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 @@ -152,14 +155,14 @@ irc::string operator+ (irc::string& leftval, std::string& rightval) return leftval + irc::string(rightval.c_str()); } -std::string operator== (std::string& leftval, irc::string& rightval) +bool operator== (std::string& leftval, irc::string& rightval) { return (leftval == std::string(rightval.c_str())); } -irc::string operator== (irc::string& leftval, std::string& rightval) +bool operator== (irc::string& leftval, std::string& rightval) { - return (rightval == irc::string(leftval.c_str())); + return (rightval == std::string(leftval.c_str())); } const char* irc::irc_char_traits::find(const char* s1, int n, char c)