X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fhashcomp.cpp;h=91a75d5e3c35539143823e11c4a53ccfb2229659;hb=1383dba43e463f292aea094d01f62f355946049d;hp=62aef7ffe8d73c4d4fe3ac556792572ce178c63c;hpb=bf6ec00f3dc5ae23da1e8a4e20d44555eca0593a;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/hashcomp.cpp b/src/hashcomp.cpp index 62aef7ffe..91a75d5e3 100644 --- a/src/hashcomp.cpp +++ b/src/hashcomp.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * Inspire is copyright (C) 2002-2005 ChatSpike-Dev. + * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. * E-mail: * * @@ -16,6 +16,7 @@ using namespace std; +#include "inspircd_config.h" #include "inspircd.h" #include #include "hashcomp.h" @@ -115,27 +116,27 @@ bool irc::InAddr_HashComp::operator()(const in_addr &s1, const in_addr &s2) cons bool irc::irc_char_traits::eq(char c1st, char c2nd) { - return lowermap[c1st] == lowermap[c2nd]; + return lowermap[(unsigned)c1st] == lowermap[(unsigned)c2nd]; } bool irc::irc_char_traits::ne(char c1st, char c2nd) { - return lowermap[c1st] != lowermap[c2nd]; + return lowermap[(unsigned)c1st] != lowermap[(unsigned)c2nd]; } bool irc::irc_char_traits::lt(char c1st, char c2nd) { - return lowermap[c1st] < lowermap[c2nd]; + return lowermap[(unsigned)c1st] < lowermap[(unsigned)c2nd]; } int irc::irc_char_traits::compare(const char* str1, const char* str2, size_t n) { - for(int i = 0; i < n; i++) + for(unsigned int i = 0; i < n; i++) { - if(lowermap[*str1] > lowermap[*str2]) + if(lowermap[(unsigned)*str1] > lowermap[(unsigned)*str2]) return 1; - if(lowermap[*str1] < lowermap[*str2]) + if(lowermap[(unsigned)*str1] < lowermap[(unsigned)*str2]) return -1; if(*str1 == 0 || *str2 == 0) @@ -149,7 +150,7 @@ int irc::irc_char_traits::compare(const char* str1, const char* str2, size_t n) const char* irc::irc_char_traits::find(const char* s1, int n, char c) { - while(n-- > 0 && lowermap[*s1] != lowermap[c]) + while(n-- > 0 && lowermap[(unsigned)*s1] != lowermap[(unsigned)c]) s1++; return s1; }