X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands.cpp;h=427633ef4663e8e81554ff40cecfb7ac8fdd533b;hb=a9621bc98996e08d86734e6848de13223341ea64;hp=e4fc939ea608a528dda56dc2358bcdfb9369614d;hpb=d54fbc71e2a2e0f70002e2d36c669c4aa3d59e17;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/commands.cpp b/src/commands.cpp
index e4fc939ea..427633ef4 100644
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -29,9 +29,6 @@
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/resource.h>
-#ifdef THREADED_DNS
-#include <pthread.h>
-#endif
 #ifndef RUSAGE_SELF
 #define   RUSAGE_SELF     0
 #define   RUSAGE_CHILDREN     -1
@@ -47,7 +44,6 @@
 #include "mode.h"
 #include "xline.h"
 #include "inspstring.h"
-#include "dnsqueue.h"
 #include "helperfuncs.h"
 #include "hashcomp.h"
 #include "socketengine.h"
@@ -89,7 +85,7 @@ void split_chlist(userrec* user, userrec* dest, const std::string &cl)
 	prefix << ":" << Config->ServerName << " 319 " << user->nick << " " << dest->nick << " :";
 	line = prefix.str();
 	
-	for (start = 0; pos = cl.find(' ', start); start = pos+1)
+	for (start = 0; (pos = cl.find(' ', start)) != std::string::npos; start = pos+1)
 	{
 		length = (pos == std::string::npos) ? cl.length() : pos;
 		
@@ -127,7 +123,7 @@ bool is_uline(const char* server)
 	return (find(Config->ulines.begin(),Config->ulines.end(),server) != Config->ulines.end());
 }
 
-int operstrcmp(char* data,char* input)
+int operstrcmp(const char* data,const char* input)
 {
 	int MOD_RESULT = 0;
 	FOREACH_RESULT(I_OnOperCompare,OnOperCompare(data,input))
@@ -243,7 +239,7 @@ bool ip_matches_everyone(const std::string &ip, userrec* user)
 	
 	for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++)
 	{
-		if (match((char*)inet_ntoa(u->second->ip4),ip.c_str()))
+		if (match(u->second->GetIPString(),ip.c_str()))
 			matches++;
 	}