size_t nspace::hash<in_addr>::operator()(const struct in_addr &a) const
{
- size_t q;
- memcpy(&q,&a,sizeof(size_t));
- return q;
+ size_t q;
+ memcpy(&q,&a,sizeof(size_t));
+ return q;
}
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);
+ unsigned char* n1 = (unsigned char*)s1.c_str();
+ unsigned char* n2 = (unsigned char*)s2.c_str();
+ for (; *n1 && *n2; n1++, n2++)
+ if (lowermap[*n1] != lowermap[*n2])
+ return false;
+ return (lowermap[*n1] == lowermap[*n2]);
}
bool irc::InAddr_HashComp::operator()(const in_addr &s1, const in_addr &s2) const
{
- return (s1.s_addr == s1.s_addr);
+ return (s1.s_addr == s1.s_addr);
}
/******************************************************
bool irc::irc_char_traits::eq(char c1st, char c2nd)
{
- return lowermap[(unsigned)c1st] == lowermap[(unsigned)c2nd];
+ return lowermap[(unsigned char)c1st] == lowermap[(unsigned char)c2nd];
}
bool irc::irc_char_traits::ne(char c1st, char c2nd)
{
- return lowermap[(unsigned)c1st] != lowermap[(unsigned)c2nd];
+ return lowermap[(unsigned char)c1st] != lowermap[(unsigned char)c2nd];
}
bool irc::irc_char_traits::lt(char c1st, char c2nd)
{
- return lowermap[(unsigned)c1st] < lowermap[(unsigned)c2nd];
+ return lowermap[(unsigned char)c1st] < lowermap[(unsigned char)c2nd];
}
int irc::irc_char_traits::compare(const char* str1, const char* str2, size_t n)
{
for(unsigned int i = 0; i < n; i++)
{
- if(lowermap[(unsigned)*str1] > lowermap[(unsigned)*str2])
- return 1;
+ if(lowermap[(unsigned char)*str1] > lowermap[(unsigned char)*str2])
+ return 1;
- if(lowermap[(unsigned)*str1] < lowermap[(unsigned)*str2])
- return -1;
+ if(lowermap[(unsigned char)*str1] < lowermap[(unsigned char)*str2])
+ return -1;
- if(*str1 == 0 || *str2 == 0)
- return 0;
+ if(*str1 == 0 || *str2 == 0)
+ return 0;
str1++;
str2++;
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)
{
- while(n-- > 0 && lowermap[(unsigned)*s1] != lowermap[(unsigned)c])
+ while(n-- > 0 && lowermap[(unsigned char)*s1] != lowermap[(unsigned char)c])
s1++;
return s1;
}