X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmessage.cpp;h=ce51f8c87c5be28c0d064f988c573260c1d84bc3;hb=b70de5aa7840e8b43c9c5bdbeb0146ec1d5ea1a0;hp=2f527c983e6ba9b0812af1ead2b8a91333e0b50d;hpb=ace0f7f83f3322cc3b251835c7a44d63c8d8acb3;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/message.cpp b/src/message.cpp
index 2f527c983..ce51f8c87 100644
--- a/src/message.cpp
+++ b/src/message.cpp
@@ -68,9 +68,9 @@ int common_channels(userrec *u, userrec *u2)
 		log(DEFAULT,"*** BUG *** common_channels was given an invalid parameter");
 		return 0;
 	}
-	for (int i = 0; i != MAXCHANS; i++)
+	for (unsigned int i = 0; i < u->chans.size(); i++)
 	{
-		for (int z = 0; z != MAXCHANS; z++)
+		for (unsigned int z = 0; z != u2->chans.size(); z++)
 		{
 			if ((u->chans[i].channel != NULL) && (u2->chans[z].channel != NULL))
 			{
@@ -87,32 +87,35 @@ int common_channels(userrec *u, userrec *u2)
 	return 0;
 }
 
-
 void tidystring(char* str)
 {
 	// strips out double spaces before a : parameter
-	
+
 	char temp[MAXBUF];
 	bool go_again = true;
-	
+
 	if (!str)
-	{
 		return;
-	}
-	
-	while ((str[0] == ' ') && (strlen(str)>0))
-	{
+
+	// pointer voodoo++ --w00t
+	while ((*str) && (*str == ' '))
 		str++;
-	}
-	
+
 	while (go_again)
 	{
 		bool noparse = false;
-		unsigned int t = 0, a = 0;
+		int t = 0, a = 0;
 		go_again = false;
-		while (a < strlen(str))
+		const int lenofstr = strlen(str);
+
+		/*
+		 * by caching strlen() of str, we theoretically avoid 3 expensive calls each time this loop
+		 * rolls around.. should speed things up a nanosecond or two. ;)
+		 */
+
+		while (a < lenofstr)
 		{
-			if ((a<strlen(str)-1) && (noparse==false))
+			if ((a < lenofstr - 1) && (noparse == false))
 			{
 				if ((str[a] == ' ') && (str[a+1] == ' '))
 				{
@@ -121,17 +124,18 @@ void tidystring(char* str)
 					a++;
 				}
 			}
-			
-			if (a<strlen(str)-1)
+
+			if (a < lenofstr - 1)
 			{
 				if ((str[a] == ' ') && (str[a+1] == ':'))
 				{
 					noparse = true;
 				}
 			}
-			
+
 			temp[t++] = str[a++];
 		}
+
 		temp[t] = '\0';
 		strlcpy(str,temp,MAXBUF);
 	}
@@ -193,7 +197,7 @@ int CleanAndResolve (char *resolvedHost, const char *unresolvedHost)
 int c_count(userrec* u)
 {
 	int z = 0;
-	for (int i =0; i != MAXCHANS; i++)
+	for (unsigned int i =0; i < u->chans.size(); i++)
 		if (u->chans[i].channel != NULL)
 			z++;
 	return z;
@@ -212,7 +216,7 @@ bool hasumode(userrec* user, char mode)
 
 void ChangeName(userrec* user, const char* gecos)
 {
-	if (!strcasecmp(user->server,ServerName))
+	if (user->fd > -1)
 	{
 		int MOD_RESULT = 0;
 		FOREACH_RESULT(OnChangeLocalUserGECOS(user,gecos));
@@ -225,7 +229,7 @@ void ChangeName(userrec* user, const char* gecos)
 
 void ChangeDisplayedHost(userrec* user, const char* host)
 {
-        if (!strcasecmp(user->server,ServerName))
+        if (user->fd > -1)
         {
                 int MOD_RESULT = 0;
                 FOREACH_RESULT(OnChangeLocalUserHost(user,host));
@@ -311,7 +315,7 @@ char* cmode(userrec *user, chanrec *chan)
 		return "";
 	}
 
-	for (int i = 0; i != MAXCHANS; i++)
+	for (unsigned int i = 0; i < user->chans.size(); i++)
 	{
 		if (user->chans[i].channel)
 		{
@@ -351,7 +355,7 @@ int cstatus(userrec *user, chanrec *chan)
 	if (is_uline(user->server))
 		return STATUS_OP;
 
-	for (int i = 0; i != MAXCHANS; i++)
+	for (unsigned int i = 0; i < user->chans.size(); i++)
 	{
 		if (user->chans[i].channel)
 		{
@@ -385,7 +389,7 @@ int has_channel(userrec *u, chanrec *c)
 		log(DEFAULT,"*** BUG *** has_channel was given an invalid parameter");
 		return 0;
 	}
-	for (int i =0; i != MAXCHANS; i++)
+	for (unsigned int i =0; i < u->chans.size(); i++)
 	{
 		if (u->chans[i].channel)
 		{
@@ -427,42 +431,33 @@ void TidyBan(char *ban)
 
 char lst[MAXBUF];
 
-char* chlist(userrec *user,userrec* source)
+std::string chlist(userrec *user,userrec* source)
 {
-	char cmp[MAXBUF];
+	std::string cmp = "";
+	std::string lst = "";
         log(DEBUG,"chlist: %s",user->nick);
-	strcpy(lst,"");
 	if (!user)
 	{
 		return lst;
 	}
-	for (int i = 0; i != MAXCHANS; i++)
+	for (unsigned int i = 0; i < user->chans.size(); i++)
 	{
 		if (user->chans[i].channel != NULL)
 		{
 			if (user->chans[i].channel->name)
 			{
-				strlcpy(cmp,user->chans[i].channel->name,MAXBUF);
-				strlcat(cmp," ",MAXBUF);
-				if (!strstr(lst,cmp))
+				cmp = std::string(user->chans[i].channel->name) + " ";
+				if (!strstr(lst.c_str(),cmp.c_str()))
 				{
 					// if the channel is NOT private/secret, OR the source user is on the channel
 					if (((!(user->chans[i].channel->binarymodes & CM_PRIVATE)) && (!(user->chans[i].channel->binarymodes & CM_SECRET))) || (has_channel(source,user->chans[i].channel)))
 					{
-						strlcat(lst,cmode(user,user->chans[i].channel),MAXBUF);
-						strlcat(lst,user->chans[i].channel->name,MAXBUF);
-						strlcat(lst," ",MAXBUF);
+						lst = lst + std::string(cmode(user,user->chans[i].channel)) + std::string(user->chans[i].channel->name) + " ";
 					}
 				}
 			}
 		}
 	}
-	if (strlen(lst))
-	{
-		lst[strlen(lst)-1] = '\0'; // chop trailing space
-	}
 	return lst;
 }
 
-
-