X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fhashcomp.cpp;h=d107df3093efd5cbe51a236eab2a3ac6b64f46c4;hb=77123f4dec9f29105f6c0ceea0262cfe8e9eaa1a;hp=62aef7ffe8d73c4d4fe3ac556792572ce178c63c;hpb=bf6ec00f3dc5ae23da1e8a4e20d44555eca0593a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/hashcomp.cpp b/src/hashcomp.cpp
index 62aef7ffe..d107df309 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>
@@ -16,6 +16,7 @@
 
 using namespace std;
 
+#include "inspircd_config.h"
 #include "inspircd.h"
 #include <string>
 #include "hashcomp.h"
@@ -68,36 +69,33 @@ using namespace std;
 
 size_t nspace::hash<in_addr>::operator()(const struct in_addr &a) const
 {
-        size_t q;
-        memcpy(&q,&a,sizeof(size_t));
-        return q;
+	size_t q;
+	memcpy(&q,&a,sizeof(size_t));
+	return q;
 }
 
 size_t nspace::hash<string>::operator()(const string &s) const
 {
-        char a[MAXBUF];
-        static struct hash<const char *> strhash;
-        strlcpy(a,s.c_str(),MAXBUF);
-        strlower(a);
-        return strhash(a);
+	char a[MAXBUF];
+	static struct hash<const char *> strhash;
+	strlcpy(a,s.c_str(),MAXBUF);
+	strlower(a);
+	return strhash(a);
 }
 
 bool irc::StrHashComp::operator()(const std::string& s1, const std::string& s2) const
 {
-	irc::string a = s1.c_str();
-	irc::string b = s2.c_str();
-        return (a == b);
+	unsigned char* n1 = (unsigned char*)s1.c_str();
+	unsigned char* n2 = (unsigned char*)s2.c_str();
+	for (; *n1 && *n2; n1++, n2++)
+		if (lowermap[*n1] != lowermap[*n2])
+			return false;
+	return (lowermap[*n1] == lowermap[*n2]);
 }
 
 bool irc::InAddr_HashComp::operator()(const in_addr &s1, const in_addr &s2) const
 {
-        size_t q;
-        size_t p;
-
-        memcpy(&q,&s1,sizeof(size_t));
-        memcpy(&p,&s2,sizeof(size_t));
-
-        return (q == p);
+	return (s1.s_addr == s1.s_addr);
 }
 
 /******************************************************
@@ -115,31 +113,31 @@ 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 char)c1st] == lowermap[(unsigned char)c2nd];
 }
 
 bool irc::irc_char_traits::ne(char c1st, char c2nd)
 {
-	return lowermap[c1st] != lowermap[c2nd];
+	return lowermap[(unsigned char)c1st] != lowermap[(unsigned char)c2nd];
 }
 
 bool irc::irc_char_traits::lt(char c1st, char c2nd)
 {
-	return lowermap[c1st] < lowermap[c2nd];
+	return lowermap[(unsigned char)c1st] < lowermap[(unsigned char)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])
-       	        	return 1;
+		if(lowermap[(unsigned char)*str1] > lowermap[(unsigned char)*str2])
+       			return 1;
 
-		if(lowermap[*str1] < lowermap[*str2])
-	               	return -1;
+		if(lowermap[(unsigned char)*str1] < lowermap[(unsigned char)*str2])
+		       	return -1;
 
-	        if(*str1 == 0 || *str2 == 0)
-	              	return 0;
+		if(*str1 == 0 || *str2 == 0)
+		      	return 0;
 
 	       	str1++;
 		str2++;
@@ -147,9 +145,43 @@ int irc::irc_char_traits::compare(const char* str1, const char* str2, size_t n)
 	return 0;
 }
 
+std::string operator+ (std::string& leftval, irc::string& rightval)
+{
+	return leftval + std::string(rightval.c_str());
+}
+
+irc::string operator+ (irc::string& leftval, std::string& rightval)
+{
+	return leftval + irc::string(rightval.c_str());
+}
+
+bool operator== (std::string& leftval, irc::string& rightval)
+{
+	return (leftval == std::string(rightval.c_str()));
+}
+
+bool operator== (irc::string& leftval, std::string& rightval)
+{
+	return (rightval == std::string(leftval.c_str()));
+}
+
 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 char)*s1] != lowermap[(unsigned char)c])
 		s1++;
 	return s1;
 }
+
+/* See hashcomp.h if you care about these... */
+std::ostream& operator<<(std::ostream &os, const irc::string &str)
+{
+	return os << str.c_str();
+}
+
+std::istream& operator>>(std::istream &is, irc::string &str)
+{
+	std::string tmp;
+	is >> tmp;
+	str = tmp.c_str();
+	return is;
+}