Remove next_call garbage.. It didn't really do much more than obfuscate things. InspI...

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

diff --git a/src/hashcomp.cpp b/src/hashcomp.cpp
index 55bad8bf7a59bbc59be889e2c2d6b446f4d3e316..49befd634bcd4df023bd117728cc3a59b96a2643 100644 (file)
--- a/src/hashcomp.cpp
+++ b/src/hashcomp.cpp
@@ -245,7 +245,7 @@ irc::sepstream::sepstream(const std::string &source, char seperator) : tokens(so
        n = tokens.begin();
 }
 
-const std::string irc::sepstream::GetToken()
+bool irc::sepstream::GetToken(std::string &token)
 {
        std::string::iterator lsp = last_starting_position;
 
@@ -254,18 +254,22 @@ const std::string irc::sepstream::GetToken()
                if ((*n == sep) || (n+1 == tokens.end()))
                {
                        last_starting_position = n+1;
-                       std::string strip = std::string(lsp, n+1 == tokens.end() ? n+1  : n++);
+                       token = std::string(lsp, n+1 == tokens.end() ? n+1  : n++);
 
-                       while ((strip.length()) && (strip.find_last_of(sep) == strip.length() - 1))
-                               strip.erase(strip.end() - 1);
+                       while ((token.length()) && (token.find_last_of(sep) == token.length() - 1))
+                               token.erase(token.end() - 1);
+
+                       if (token.empty())
+                               n++;
 
-                       return strip;
+                       return n == tokens.end() ? false : true;
                }
 
                n++;
        }
 
-       return "";
+       token = "";
+       return false;
 }
 
 const std::string irc::sepstream::GetRemaining()
@@ -290,19 +294,17 @@ 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";
-
-       std::string buf;
-       buf.reserve(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;
 }
 
 CoreExport const char* irc::Spacify(const char* n)
@@ -455,16 +457,15 @@ long irc::portparser::GetToken()
                        in_range = 0;
        }
 
-       std::string x = sep->GetToken();
+       std::string x;
+       sep->GetToken(x);
 
        if (x.empty())
                return 0;
 
        while (Overlaps(atoi(x.c_str())))
        {
-               x = sep->GetToken();
-
-               if (x.empty())
+               if (!sep->GetToken(x))
                        return 0;
        }