/who tidyup - needs QA'ing

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

diff --git a/src/hashcomp.cpp b/src/hashcomp.cpp
index e076d1d7120b7d95708c0a690d4837eca63bdec2..53483c7480f0322b078d7aed905648097b73b3ec 100644 (file)
--- a/src/hashcomp.cpp
+++ b/src/hashcomp.cpp
@@ -2,20 +2,15 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                    E-mail:
- *             <brain@chatspike.net>
- *             <Craig@chatspike.net>
+ *  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"
 #include <ext/hash_map>
@@ -44,13 +39,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,13 +61,6 @@ void nspace::strlower(char *n)
        }
 }
 
-size_t nspace::hash<insp_inaddr>::operator()(const insp_inaddr &a) const
-{
-       size_t q;
-       memcpy(&q,&a,sizeof(size_t));
-       return q;
-}
-
 size_t nspace::hash<string>::operator()(const string &s) const
 {
        /* XXX: NO DATA COPIES! :)
@@ -110,18 +93,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
@@ -290,6 +261,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()
 {
 }
@@ -316,7 +297,7 @@ std::string irc::hex(const unsigned char *raw, size_t rawsz)
        return buf;
 }
 
-const char* irc::Spacify(char* n)
+const char* irc::Spacify(const char* n)
 {
        static char x[MAXBUF];
        strlcpy(x,n,MAXBUF);
@@ -354,19 +335,37 @@ void irc::modestacker::PushMinus()
        this->Push('-',"");
 }
 
-int irc::modestacker::GetStackedLine(std::deque<std::string> &result)
+int irc::modestacker::GetStackedLine(std::deque<std::string> &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+1) && ((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++;
        }