Review and optimize

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

diff --git a/src/message.cpp b/src/message.cpp
index 8c03e85f2072d8dc788f6f4aca61c788a89f09ef..de6e012ac15fca3bbace1d2229af91aeff4b29cd 100644 (file)
--- a/src/message.cpp
+++ b/src/message.cpp
@@ -19,7 +19,6 @@ using namespace std;
 #include "inspircd_config.h"
 #include "inspircd.h"
 #include "inspircd_io.h"
-#include "inspircd_util.h"
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/errno.h>
@@ -50,13 +49,8 @@ using namespace std;
 extern int MODCOUNT;
 extern std::vector<Module*> modules;
 extern std::vector<ircd_module*> factory;
-
-extern char ServerName[MAXBUF];
-
 extern time_t TIME;
-
-extern FILE *log_file;
-extern char DNSServer[MAXBUF];
+extern ServerConfig* Config;
 
 /* return 0 or 1 depending if users u and u2 share one or more common channels
  * (used by QUIT, NICK etc which arent channel specific notices) */
@@ -87,32 +81,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 +118,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);
        }
@@ -179,9 +177,9 @@ void NonBlocking(int s)
 
 int CleanAndResolve (char *resolvedHost, const char *unresolvedHost)
 {
-       DNS d(DNSServer);
+       DNS d(Config->DNSServer);
        int fd = d.ReverseLookup(unresolvedHost);
-       if (fd < 1)
+       if (fd < 0)
                return 0;
        time_t T = time(NULL)+1;
        while ((!d.HasResult()) && (time(NULL)<T));