X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fhashcomp.cpp;h=88b9b582cfa86a7feec9bc56c8010db08f05679a;hb=1b7c615062a7b203c7fc3ce4c56e16eb671f7c15;hp=d4f9e53d646caf6097364ed31a5379be2ddc6d70;hpb=6050df73f498d05597fb37c6157868df1f6f4db2;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/hashcomp.cpp b/src/hashcomp.cpp
index d4f9e53d6..88b9b582c 100644
--- a/src/hashcomp.cpp
+++ b/src/hashcomp.cpp
@@ -16,17 +16,11 @@
 
 using namespace std;
 
-#include "inspircd_config.h"
 #include "inspircd.h"
-#include <string>
 #include "hashcomp.h"
-
 #include <ext/hash_map>
-
 #define nspace __gnu_cxx
 
-char lowermap[255];
-
 /******************************************************
  *
  * The hash functions of InspIRCd are the centrepoint
@@ -127,9 +121,7 @@ bool irc::InAddr_HashComp::operator()(const insp_inaddr &s1, const insp_inaddr &
  * std::string which is not only case-insensitive but
  * can also do scandanavian comparisons, e.g. { = [, etc.
  *
- * This class depends on the global 'lowermap' which is
- * initialized at startup by inspircd.cpp, and contains
- * the 'scandanavian' casemappings for fast irc compare.
+ * This class depends on the const array 'lowermap'.
  *
  ******************************************************/
 
@@ -210,10 +202,6 @@ std::istream& operator>>(std::istream &is, irc::string &str)
 
 irc::tokenstream::tokenstream(const std::string &source) : tokens(source), last_pushed(false)
 {
-	/* Remove trailing spaces, these muck up token parsing */
-	while (tokens.find_last_of(' ') == tokens.length() - 1)
-		tokens.erase(tokens.end() - 1);
-
 	/* Record starting position and current position */
 	last_starting_position = tokens.begin();
 	n = tokens.begin();
@@ -247,7 +235,12 @@ const std::string irc::tokenstream::GetToken()
 			 */
 			last_starting_position = n+1;
 			last_pushed = true;
-			return std::string(lsp, n+1 == tokens.end() ? n+1  : n++);
+
+			std::string strip(lsp, n+1 == tokens.end() ? n+1  : n++);
+			while ((strip.length()) && (strip.find_last_of(' ') == strip.length() - 1))
+				strip.erase(strip.end() - 1);
+
+			return strip;
 		}
 
 		n++;
@@ -282,18 +275,3 @@ const std::string irc::commasepstream::GetToken()
 irc::commasepstream::~commasepstream()
 {
 }
-
-void InspIRCd::MakeLowerMap()
-{       
-	// initialize the lowercase mapping table
-	for (unsigned char cn = 0; cn < 255; cn++)
-		lowermap[cn] = cn;
-	// lowercase the uppercase chars
-	for (unsigned char cn = 65; cn < 91; cn++)
-		lowermap[cn] = tolower(cn);
-	// now replace the specific chars for scandanavian comparison
-	lowermap[(unsigned char)'['] = '{';
-	lowermap[(unsigned char)']'] = '}';
-	lowermap[(unsigned char)'\\'] = '|';
-}
-