X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fhashcomp.cpp;h=a9a3441b9e80b5180b5ae07ed5c9fcdd41582de6;hb=9183ebd28c79b12ddf29b3847f59679e480af70a;hp=71d9f0ca920b421edc9823fbef335644b03f22af;hpb=a533e2fadae28de67ba53d626ac9c4225580f042;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/hashcomp.cpp b/src/hashcomp.cpp index 71d9f0ca9..a9a3441b9 100644 --- a/src/hashcomp.cpp +++ b/src/hashcomp.cpp @@ -11,18 +11,11 @@ * --------------------------------------------------- */ -/* $Core: libIRCDhash */ +/* $Core */ #include "inspircd.h" #include "hashcomp.h" -#ifndef WIN32 -#include -#define nspace __gnu_cxx -#else -#include -#define nspace stdext -using stdext::hash_map; -#endif +#include "hash_map.h" /****************************************************** * @@ -63,28 +56,33 @@ void nspace::strlower(char *n) if (n) { for (char* t = n; *t; t++) - *t = lowermap[(unsigned char)*t]; + *t = rfc_case_insensitive_map[(unsigned char)*t]; } } #ifndef WIN32 -size_t nspace::hash::operator()(const std::string &s) const + #ifdef HASHMAP_DEPRECATED + size_t nspace::insensitive::operator()(const std::string &s) const + #else + size_t nspace::hash::operator()(const std::string &s) const + #endif #else -size_t nspace::hash_compare >::operator()(const std::string &s) const + size_t nspace::hash_compare >::operator()(const std::string &s) const #endif { /* XXX: NO DATA COPIES! :) * The hash function here is practically * a copy of the one in STL's hash_fun.h, - * only with *x replaced with lowermap[*x]. + * only with *x replaced with rfc_case_insensitive_map[*x]. * This avoids a copy to use hash */ register size_t t = 0; for (std::string::const_iterator x = s.begin(); x != s.end(); ++x) /* ++x not x++, as its faster */ - t = 5 * t + lowermap[(unsigned char)*x]; + t = 5 * t + rfc_case_insensitive_map[(unsigned char)*x]; return t; } + #ifndef WIN32 size_t nspace::hash::operator()(const irc::string &s) const #else @@ -93,18 +91,18 @@ size_t nspace::hash_compare >::operator()(co { register size_t t = 0; for (irc::string::const_iterator x = s.begin(); x != s.end(); ++x) /* ++x not x++, as its faster */ - t = 5 * t + lowermap[(unsigned char)*x]; + t = 5 * t + rfc_case_insensitive_map[(unsigned char)*x]; return t; } bool irc::StrHashComp::operator()(const std::string& s1, const std::string& s2) const { - unsigned char* n1 = (unsigned char*)s1.c_str(); - unsigned char* n2 = (unsigned char*)s2.c_str(); + const unsigned char* n1 = (const unsigned char*)s1.c_str(); + const unsigned char* n2 = (const unsigned char*)s2.c_str(); for (; *n1 && *n2; n1++, n2++) - if (lowermap[*n1] != lowermap[*n2]) + if (rfc_case_insensitive_map[*n1] != rfc_case_insensitive_map[*n2]) return false; - return (lowermap[*n1] == lowermap[*n2]); + return (rfc_case_insensitive_map[*n1] == rfc_case_insensitive_map[*n2]); } /****************************************************** @@ -114,33 +112,33 @@ bool irc::StrHashComp::operator()(const std::string& s1, const std::string& s2) * std::string which is not only case-insensitive but * can also do scandanavian comparisons, e.g. { = [, etc. * - * This class depends on the const array 'lowermap'. + * This class depends on the const array 'rfc_case_insensitive_map'. * ******************************************************/ bool irc::irc_char_traits::eq(char c1st, char c2nd) { - return lowermap[(unsigned char)c1st] == lowermap[(unsigned char)c2nd]; + return rfc_case_insensitive_map[(unsigned char)c1st] == rfc_case_insensitive_map[(unsigned char)c2nd]; } bool irc::irc_char_traits::ne(char c1st, char c2nd) { - return lowermap[(unsigned char)c1st] != lowermap[(unsigned char)c2nd]; + return rfc_case_insensitive_map[(unsigned char)c1st] != rfc_case_insensitive_map[(unsigned char)c2nd]; } bool irc::irc_char_traits::lt(char c1st, char c2nd) { - return lowermap[(unsigned char)c1st] < lowermap[(unsigned char)c2nd]; + return rfc_case_insensitive_map[(unsigned char)c1st] < rfc_case_insensitive_map[(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 char)*str1] > lowermap[(unsigned char)*str2]) + if(rfc_case_insensitive_map[(unsigned char)*str1] > rfc_case_insensitive_map[(unsigned char)*str2]) return 1; - if(lowermap[(unsigned char)*str1] < lowermap[(unsigned char)*str2]) + if(rfc_case_insensitive_map[(unsigned char)*str1] < rfc_case_insensitive_map[(unsigned char)*str2]) return -1; if(*str1 == 0 || *str2 == 0) @@ -154,7 +152,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[(unsigned char)*s1] != lowermap[(unsigned char)c]) + while(n-- > 0 && rfc_case_insensitive_map[(unsigned char)*s1] != rfc_case_insensitive_map[(unsigned char)c]) s1++; return s1; } @@ -318,7 +316,7 @@ CoreExport const char* irc::Spacify(const char* n) } -irc::modestacker::modestacker(bool add) : adding(add) +irc::modestacker::modestacker(InspIRCd* Instance, bool add) : ServerInstance(Instance), adding(add) { sequence.clear(); sequence.push_back(""); @@ -362,7 +360,7 @@ int irc::modestacker::GetStackedLine(std::deque &result, int max_li if (sequence.size() > 1) nextsize = sequence[1].length() + 2; - while (!sequence[0].empty() && (sequence.size() > 1) && (result.size() < MAXMODES) && ((size + nextsize) < max_line_size)) + while (!sequence[0].empty() && (sequence.size() > 1) && (result.size() < ServerInstance->Config->Limits.MaxModes) && ((size + nextsize) < max_line_size)) { result[0] += *(sequence[0].begin()); if (!sequence[1].empty()) @@ -384,6 +382,9 @@ int irc::modestacker::GetStackedLine(std::deque &result, int max_li irc::stringjoiner::stringjoiner(const std::string &seperator, const std::vector &sequence, int begin, int end) { + if (end < begin) + throw "stringjoiner logic error, this causes problems."; + for (int v = begin; v < end; v++) joined.append(sequence[v]).append(seperator); joined.append(sequence[end]); @@ -391,13 +392,19 @@ irc::stringjoiner::stringjoiner(const std::string &seperator, const std::vector< irc::stringjoiner::stringjoiner(const std::string &seperator, const std::deque &sequence, int begin, int end) { + if (end < begin) + throw "stringjoiner logic error, this causes problems."; + for (int v = begin; v < end; v++) joined.append(sequence[v]).append(seperator); joined.append(sequence[end]); } -irc::stringjoiner::stringjoiner(const std::string &seperator, const char** sequence, int begin, int end) +irc::stringjoiner::stringjoiner(const std::string &seperator, const char* const* sequence, int begin, int end) { + if (end < begin) + throw "stringjoiner logic error, this causes problems."; + for (int v = begin; v < end; v++) joined.append(sequence[v]).append(seperator); joined.append(sequence[end]);