Convert GenRandom to std::function.

[user/henk/code/inspircd.git] / src / hashcomp.cpp

diff --git a/src/hashcomp.cpp b/src/hashcomp.cpp
index 46981e7034d30c148bc5be264acc78733baa14c8..aa06759a4d91e910b92732c37d6923a405fb964c 100644 (file)
--- a/src/hashcomp.cpp
+++ b/src/hashcomp.cpp
@@ -118,48 +118,7 @@ unsigned const char rfc_case_insensitive_map[256] = {
        250, 251, 252, 253, 254, 255,                     // 250-255
 };
 
-/**
- * A case sensitive mapping of characters from upper case to lower case for the
- * character set of RFC 1459. This is identical to ASCII.
- */
-unsigned const char rfc_case_sensitive_map[256] = {
-       0,   1,   2,   3,   4,   5,   6,   7,   8,   9,   // 0-9
-       10,  11,  12,  13,  14,  15,  16,  17,  18,  19,  // 10-19
-       20,  21,  22,  23,  24,  25,  26,  27,  28,  29,  // 20-29
-       30,  31,  32,  33,  34,  35,  36,  37,  38,  39,  // 30-39
-       40,  41,  42,  43,  44,  45,  46,  47,  48,  49,  // 40-49
-       50,  51,  52,  53,  54,  55,  56,  57,  58,  59,  // 50-59
-       60,  61,  62,  63,  64,  65,  66,  67,  68,  69,  // 60-69
-       70,  71,  72,  73,  74,  75,  76,  77,  78,  79,  // 70-79
-       80,  81,  82,  83,  84,  85,  86,  87,  88,  89,  // 80-89
-       90,  91,  92,  93,  94,  95,  96,  97,  98,  99,  // 90-99
-       100, 101, 102, 103, 104, 105, 106, 107, 108, 109, // 100-109
-       110, 111, 112, 113, 114, 115, 116, 117, 118, 119, // 110-119
-       120, 121, 122, 123, 124, 125, 126, 127, 128, 129, // 120-129
-       130, 131, 132, 133, 134, 135, 136, 137, 138, 139, // 130-139
-       140, 141, 142, 143, 144, 145, 146, 147, 148, 149, // 140-149
-       150, 151, 152, 153, 154, 155, 156, 157, 158, 159, // 150-159
-       160, 161, 162, 163, 164, 165, 166, 167, 168, 169, // 160-169
-       170, 171, 172, 173, 174, 175, 176, 177, 178, 179, // 170-179
-       180, 181, 182, 183, 184, 185, 186, 187, 188, 189, // 180-189
-       190, 191, 192, 193, 194, 195, 196, 197, 198, 199, // 190-199
-       200, 201, 202, 203, 204, 205, 206, 207, 208, 209, // 200-209
-       210, 211, 212, 213, 214, 215, 216, 217, 218, 219, // 210-219
-       220, 221, 222, 223, 224, 225, 226, 227, 228, 229, // 220-229
-       230, 231, 232, 233, 234, 235, 236, 237, 238, 239, // 230-239
-       240, 241, 242, 243, 244, 245, 246, 247, 248, 249, // 240-249
-       250, 251, 252, 253, 254, 255,                     // 250-255
-};
-
-size_t CoreExport irc::hash::operator()(const irc::string &s) const
-{
-       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 + national_case_insensitive_map[(unsigned char)*x];
-       return t;
-}
-
-bool irc::StrHashComp::operator()(const std::string& s1, const std::string& s2) const
+bool irc::equals(const std::string& s1, const std::string& s2)
 {
        const unsigned char* n1 = (const unsigned char*)s1.c_str();
        const unsigned char* n2 = (const unsigned char*)s2.c_str();
@@ -196,7 +155,7 @@ size_t irc::insensitive::operator()(const std::string &s) const
         * only with *x replaced with national_case_insensitive_map[*x].
         * This avoids a copy to use hash<const char*>
         */
-       register size_t t = 0;
+       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 + national_case_insensitive_map[(unsigned char)*x];
        return t;
@@ -268,7 +227,7 @@ bool irc::tokenstream::GetToken(std::string &token)
        /* This is the last parameter */
        if (token[0] == ':' && !first)
        {
-               token = token.substr(1);
+               token.erase(token.begin());
                if (!StreamEnd())
                {
                        token += ' ';
@@ -280,14 +239,6 @@ bool irc::tokenstream::GetToken(std::string &token)
        return true;
 }
 
-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;
@@ -332,7 +283,7 @@ bool irc::sepstream::GetToken(std::string &token)
        if (p == std::string::npos)
                p = this->tokens.length();
 
-       token = this->tokens.substr(this->pos, p - this->pos);
+       token.assign(tokens, this->pos, p - this->pos);
        this->pos = p + 1;
 
        return true;
@@ -412,10 +363,9 @@ long irc::portparser::GetToken()
        std::string::size_type dash = x.rfind('-');
        if (dash != std::string::npos)
        {
-               std::string sbegin = x.substr(0, dash);
-               std::string send = x.substr(dash+1, x.length());
+               std::string sbegin(x, 0, dash);
                range_begin = atoi(sbegin.c_str());
-               range_end = atoi(send.c_str());
+               range_end = atoi(x.c_str()+dash+1);
 
                if ((range_begin > 0) && (range_end > 0) && (range_begin < 65536) && (range_end < 65536) && (range_begin < range_end))
                {