X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fhashcomp.cpp;h=91a75d5e3c35539143823e11c4a53ccfb2229659;hb=1383dba43e463f292aea094d01f62f355946049d;hp=a076dc46b36c51a3ad40924e34489bf06fb477a0;hpb=a79130a1e1c6fc44051acee01f77891c453e436f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/hashcomp.cpp b/src/hashcomp.cpp
index a076dc46b..91a75d5e3 100644
--- a/src/hashcomp.cpp
+++ b/src/hashcomp.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2005 ChatSpike-Dev.
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
  *                <brain@chatspike.net>
  *                <Craig@chatspike.net>
@@ -14,8 +14,11 @@
  * ---------------------------------------------------
  */
 
-#include <string>
+using namespace std;
+
+#include "inspircd_config.h"
 #include "inspircd.h"
+#include <string>
 #include "hashcomp.h"
 #include "helperfuncs.h"
 #ifdef GCC3
@@ -31,7 +34,7 @@
 #endif
 
 // from helperfuncs.cpp
-extern char lowermap[255];
+extern const char lowermap[255];
 
 /******************************************************
  *
@@ -80,17 +83,14 @@ size_t nspace::hash<string>::operator()(const string &s) const
         return strhash(a);
 }
 
-bool StrHashComp::operator()(const string& s1, const string& s2) const
+bool irc::StrHashComp::operator()(const std::string& s1, const std::string& s2) const
 {
-        char a[MAXBUF],b[MAXBUF];
-        strlcpy(a,s1.c_str(),MAXBUF);
-        strlcpy(b,s2.c_str(),MAXBUF);
-        strlower(a);
-        strlower(b);
-        return (strcasecmp(a,b) == 0);
+	irc::string a = s1.c_str();
+	irc::string b = s2.c_str();
+        return (a == b);
 }
 
-bool InAddr_HashComp::operator()(const in_addr &s1, const in_addr &s2) const
+bool irc::InAddr_HashComp::operator()(const in_addr &s1, const in_addr &s2) const
 {
         size_t q;
         size_t p;
@@ -116,27 +116,27 @@ bool InAddr_HashComp::operator()(const in_addr &s1, const in_addr &s2) const
 
 bool irc::irc_char_traits::eq(char c1st, char c2nd)
 {
-	return lowermap[c1st] == lowermap[c2nd];
+	return lowermap[(unsigned)c1st] == lowermap[(unsigned)c2nd];
 }
 
 bool irc::irc_char_traits::ne(char c1st, char c2nd)
 {
-	return lowermap[c1st] != lowermap[c2nd];
+	return lowermap[(unsigned)c1st] != lowermap[(unsigned)c2nd];
 }
 
 bool irc::irc_char_traits::lt(char c1st, char c2nd)
 {
-	return lowermap[c1st] < lowermap[c2nd];
+	return lowermap[(unsigned)c1st] < lowermap[(unsigned)c2nd];
 }
 
 int irc::irc_char_traits::compare(const char* str1, const char* str2, size_t n)
 {
-	for(int i = 0; i < n; i++)
+	for(unsigned int i = 0; i < n; i++)
 	{
-		if(lowermap[*str1] > lowermap[*str2])
+		if(lowermap[(unsigned)*str1] > lowermap[(unsigned)*str2])
        	        	return 1;
 
-		if(lowermap[*str1] < lowermap[*str2])
+		if(lowermap[(unsigned)*str1] < lowermap[(unsigned)*str2])
 	               	return -1;
 
 	        if(*str1 == 0 || *str2 == 0)
@@ -150,7 +150,7 @@ int irc::irc_char_traits::compare(const char* str1, const char* str2, size_t n)
 
 const char* irc::irc_char_traits::find(const char* s1, int  n, char c)
 {
-	while(n-- > 0 && lowermap[*s1] != lowermap[c])
+	while(n-- > 0 && lowermap[(unsigned)*s1] != lowermap[(unsigned)c])
 		s1++;
 	return s1;
 }