New logging implementation. Also write messages about InspIRCd::Log() being deprecate...

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

diff --git a/src/hashcomp.cpp b/src/hashcomp.cpp
index caf93ec1be9ebec29ca450d6476aeaeef93842da..71d9f0ca920b421edc9823fbef335644b03f22af 100644 (file)
--- a/src/hashcomp.cpp
+++ b/src/hashcomp.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -11,6 +11,8 @@
  * ---------------------------------------------------
  */
 
+/* $Core: libIRCDhash */
+
 #include "inspircd.h"
 #include "hashcomp.h"
 #ifndef WIN32
@@ -47,8 +49,6 @@ using stdext::hash_map;
  *
  ******************************************************/
 
-using namespace irc::sockets;
-
 /* convert a string to lowercase. Note following special circumstances
  * taken from RFC 1459. Many "official" server branches still hold to this
  * rule so i will too;
@@ -68,9 +68,9 @@ void nspace::strlower(char *n)
 }
 
 #ifndef WIN32
-size_t nspace::hash<string>::operator()(const string &s) const
+size_t nspace::hash<std::string>::operator()(const std::string &s) const
 #else
-size_t nspace::hash_compare<string, std::less<string> >::operator()(const string &s) const
+size_t nspace::hash_compare<std::string, std::less<std::string> >::operator()(const std::string &s) const
 #endif
 {
        /* XXX: NO DATA COPIES! :)
@@ -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);
 
-                       return strip;
+                       if (token.empty())
+                               n++;
+
+                       return n == tokens.end() ? false : true;
                }
 
                n++;
        }
 
-       return "";
+       token = "";
+       return false;
 }
 
 const std::string irc::sepstream::GetRemaining()
@@ -453,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;
        }