X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fhashcomp.cpp;h=caf93ec1be9ebec29ca450d6476aeaeef93842da;hb=a2b40829c116cd67d5f293404371eb132dcaa8e3;hp=e076d1d7120b7d95708c0a690d4837eca63bdec2;hpb=6bd9e67851ee7294e3529c3d7a4b05aa8601a2e3;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/hashcomp.cpp b/src/hashcomp.cpp index e076d1d71..caf93ec1b 100644 --- a/src/hashcomp.cpp +++ b/src/hashcomp.cpp @@ -2,24 +2,25 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * + * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * See: http://www.inspircd.org/wiki/index.php/Credits * - * Written by Craig Edwards, Craig McLure, and others. * This program is free but copyrighted software; see - * the file COPYING for details. + * the file COPYING for details. * * --------------------------------------------------- */ -using namespace std; - #include "inspircd.h" #include "hashcomp.h" +#ifndef WIN32 #include #define nspace __gnu_cxx +#else +#include +#define nspace stdext +using stdext::hash_map; +#endif /****************************************************** * @@ -44,13 +45,8 @@ using namespace std; * Scandanavian Comparisons: The characters [, ], \ will * be considered the lowercase of {, } and |. * - * This file also contains hashing methods for hashing - * insp_inaddr structs, we use this if we want to cache IP - * addresses. - * ******************************************************/ -using namespace std; using namespace irc::sockets; /* convert a string to lowercase. Note following special circumstances @@ -71,14 +67,11 @@ void nspace::strlower(char *n) } } -size_t nspace::hash::operator()(const insp_inaddr &a) const -{ - size_t q; - memcpy(&q,&a,sizeof(size_t)); - return q; -} - +#ifndef WIN32 size_t nspace::hash::operator()(const string &s) const +#else +size_t nspace::hash_compare >::operator()(const string &s) const +#endif { /* XXX: NO DATA COPIES! :) * The hash function here is practically @@ -92,7 +85,11 @@ size_t nspace::hash::operator()(const string &s) const return t; } +#ifndef WIN32 size_t nspace::hash::operator()(const irc::string &s) const +#else +size_t nspace::hash_compare >::operator()(const irc::string &s) const +#endif { register size_t t = 0; for (irc::string::const_iterator x = s.begin(); x != s.end(); ++x) /* ++x not x++, as its faster */ @@ -110,18 +107,6 @@ bool irc::StrHashComp::operator()(const std::string& s1, const std::string& s2) return (lowermap[*n1] == lowermap[*n2]); } -bool irc::InAddr_HashComp::operator()(const insp_inaddr &s1, const insp_inaddr &s2) const -{ -#ifdef IPV6 - for (int n = 0; n < 16; n++) - if (s2.s6_addr[n] != s1.s6_addr[n]) - return false; - return true; -#else - return (s1.s_addr == s1.s_addr); -#endif -} - /****************************************************** * * This is the implementation of our special irc::string @@ -153,40 +138,20 @@ 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]) - return 1; + return 1; if(lowermap[(unsigned char)*str1] < lowermap[(unsigned char)*str2]) - return -1; + return -1; if(*str1 == 0 || *str2 == 0) - return 0; + return 0; - str1++; + str1++; str2++; } return 0; } -std::string operator+ (std::string& leftval, irc::string& rightval) -{ - return leftval + std::string(rightval.c_str()); -} - -irc::string operator+ (irc::string& leftval, std::string& rightval) -{ - return leftval + irc::string(rightval.c_str()); -} - -bool operator== (std::string& leftval, irc::string& rightval) -{ - return (leftval.c_str() == rightval); -} - -bool operator== (irc::string& leftval, std::string& rightval) -{ - return (leftval == rightval.c_str()); -} - 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]) @@ -194,20 +159,6 @@ const char* irc::irc_char_traits::find(const char* s1, int n, char c) return s1; } -/* See hashcomp.h if you care about these... */ -std::ostream& operator<<(std::ostream &os, const irc::string &str) -{ - return os << str.c_str(); -} - -std::istream& operator>>(std::istream &is, irc::string &str) -{ - std::string tmp; - is >> tmp; - str = tmp.c_str(); - return is; -} - irc::tokenstream::tokenstream(const std::string &source) : tokens(source), last_pushed(false) { /* Record starting position and current position */ @@ -219,7 +170,7 @@ irc::tokenstream::~tokenstream() { } -const std::string irc::tokenstream::GetToken() +bool irc::tokenstream::GetToken(std::string &token) { std::string::iterator lsp = last_starting_position; @@ -237,7 +188,8 @@ const std::string irc::tokenstream::GetToken() */ std::string::iterator curr = ++n; n = tokens.end(); - return std::string(curr, tokens.end()); + token = std::string(curr, tokens.end()); + return true; } last_pushed = false; @@ -253,12 +205,38 @@ const std::string irc::tokenstream::GetToken() while ((strip.length()) && (strip.find_last_of(' ') == strip.length() - 1)) strip.erase(strip.end() - 1); - return strip; + token = strip; + return !token.empty(); } n++; } - return ""; + token.clear(); + return false; +} + +bool irc::tokenstream::GetToken(irc::string &token) +{ + std::string stdstring; + bool returnval = GetToken(stdstring); + token = assign(stdstring); + return returnval; +} + +bool irc::tokenstream::GetToken(int &token) +{ + std::string tok; + bool returnval = GetToken(tok); + token = ConvToInt(tok); + return returnval; +} + +bool irc::tokenstream::GetToken(long &token) +{ + std::string tok; + bool returnval = GetToken(tok); + token = ConvToInt(tok); + return returnval; } irc::sepstream::sepstream(const std::string &source, char seperator) : tokens(source), sep(seperator) @@ -290,6 +268,16 @@ const std::string irc::sepstream::GetToken() return ""; } +const std::string irc::sepstream::GetRemaining() +{ + return std::string(n, tokens.end()); +} + +bool irc::sepstream::StreamEnd() +{ + return ((n + 1) == tokens.end()); +} + irc::sepstream::~sepstream() { } @@ -302,21 +290,20 @@ std::string irc::hex(const unsigned char *raw, size_t rawsz) /* EWW! This used to be using sprintf, which is WAY inefficient. -Special */ const char *hex = "0123456789abcdef"; - - char buf[rawsz*2+1]; + static char hexbuf[MAXBUF]; size_t i, j; for (i = 0, j = 0; j < rawsz; ++j) { - buf[i++] = hex[raw[j] / 16]; - buf[i++] = hex[raw[j] % 16]; + hexbuf[i++] = hex[raw[j] / 16]; + hexbuf[i++] = hex[raw[j] % 16]; } - buf[i] = '\0'; + hexbuf[i] = 0; - return buf; + return hexbuf; } -const char* irc::Spacify(char* n) +CoreExport const char* irc::Spacify(const char* n) { static char x[MAXBUF]; strlcpy(x,n,MAXBUF); @@ -354,19 +341,37 @@ void irc::modestacker::PushMinus() this->Push('-',""); } -int irc::modestacker::GetStackedLine(std::deque &result) +int irc::modestacker::GetStackedLine(std::deque &result, int max_line_size) { + if (sequence.empty()) + { + result.clear(); + return 0; + } + int n = 0; + int size = 1; /* Account for initial +/- char */ + int nextsize = 0; result.clear(); result.push_back(adding ? "+" : "-"); - while (!sequence[0].empty() && (sequence.size() > 1) && (result.size() < MAXMODES+1)) + if (sequence.size() > 1) + nextsize = sequence[1].length() + 2; + + while (!sequence[0].empty() && (sequence.size() > 1) && (result.size() < MAXMODES) && ((size + nextsize) < max_line_size)) { result[0] += *(sequence[0].begin()); if (!sequence[1].empty()) + { result.push_back(sequence[1]); + size += nextsize; /* Account for mode character and whitespace */ + } sequence[0].erase(sequence[0].begin()); sequence.erase(sequence.begin() + 1); + + if (sequence.size() > 1) + nextsize = sequence[1].length() + 2; + n++; } @@ -450,14 +455,14 @@ long irc::portparser::GetToken() std::string x = sep->GetToken(); - if (x == "") + if (x.empty()) return 0; while (Overlaps(atoi(x.c_str()))) { x = sep->GetToken(); - if (x == "") + if (x.empty()) return 0; } @@ -501,7 +506,7 @@ irc::dynamicbitmask::~dynamicbitmask() /* Tidy up the entire used memory on delete */ delete[] bits; } - + irc::bitfield irc::dynamicbitmask::Allocate() { /* Yeah, this isnt too efficient, however a module or the core @@ -612,13 +617,3 @@ unsigned char irc::dynamicbitmask::GetSize() return bits_size; } -std::string assign(const irc::string &other) -{ - return other.c_str(); -} - -irc::string assign(const std::string &other) -{ - return other.c_str(); -} -