Signed octets in dns forward lookup! GAH

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

diff --git a/src/hashcomp.cpp b/src/hashcomp.cpp
index ca7394baa7172fe16642f15159ebae87b5dc8eea..3ef18189ee9e7fa595a06bfb7cfc5a79b6f6d4d8 100644 (file)
--- a/src/hashcomp.cpp
+++ b/src/hashcomp.cpp
@@ -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];
 
 /******************************************************
  *
@@ -82,12 +85,9 @@ size_t nspace::hash<string>::operator()(const string &s) 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 irc::InAddr_HashComp::operator()(const in_addr &s1, const in_addr &s2) const
@@ -116,27 +116,27 @@ bool irc::InAddr_HashComp::operator()(const in_addr &s1, const in_addr &s2) cons
 
 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;
 }