Removed references to deprecated files servers.* and connection.*

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

diff --git a/src/message.cpp b/src/message.cpp
index 1aeee4ae457554dc519ad60dea2c2b4e4b10aeb6..787071d8af6d105a4efebbc29c146f0a10e0223b 100644 (file)
--- a/src/message.cpp
+++ b/src/message.cpp
@@ -14,10 +14,12 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
+#include "inspircd_config.h"
 #include "inspircd.h"
 #include "inspircd_io.h"
 #include "inspircd_util.h"
-#include "inspircd_config.h"
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/errno.h>
@@ -33,9 +35,7 @@
 #include <sstream>
 #include <vector>
 #include <deque>
-#include "connection.h"
 #include "users.h"
-#include "servers.h"
 #include "ctables.h"
 #include "globals.h"
 #include "modules.h"
@@ -46,8 +46,6 @@
 #include "dns.h"
 #include "helperfuncs.h"
 
-using namespace std;
-
 extern int MODCOUNT;
 extern std::vector<Module*> modules;
 extern std::vector<ircd_module*> factory;
@@ -89,36 +87,6 @@ int common_channels(userrec *u, userrec *u2)
 }
 
 
-void safedelete(userrec *p)
-{
-       if (p)
-       {
-               log(DEBUG,"deleting %s %s %s %s",p->nick,p->ident,p->dhost,p->fullname);
-               log(DEBUG,"safedelete(userrec*): pointer is safe to delete");
-               delete p;
-               p = NULL;
-       }
-       else
-       {
-               log(DEBUG,"safedelete(userrec*): unsafe pointer operation squished");
-       }
-}
-
-void safedelete(chanrec *p)
-{
-       if (p)
-       {
-               delete p;
-               p = NULL;
-               log(DEBUG,"safedelete(chanrec*): pointer is safe to delete");
-       }
-       else
-       {
-               log(DEBUG,"safedelete(chanrec*): unsafe pointer operation squished");
-       }
-}
-
-
 void tidystring(char* str)
 {
        // strips out double spaces before a : parameter
@@ -139,7 +107,7 @@ void tidystring(char* str)
        while (go_again)
        {
                bool noparse = false;
-               int t = 0, a = 0;
+               unsigned int t = 0, a = 0;
                go_again = false;
                while (a < strlen(str))
                {
@@ -251,9 +219,6 @@ void ChangeName(userrec* user, const char* gecos)
                        return;
        }
        strlcpy(user->fullname,gecos,MAXBUF);
-       char buffer[MAXBUF];
-       snprintf(buffer,MAXBUF,"a %s :%s",user->nick,gecos);
-       NetSendToAll(buffer);
 }
 
 void ChangeDisplayedHost(userrec* user, const char* host)
@@ -266,9 +231,6 @@ void ChangeDisplayedHost(userrec* user, const char* host)
                         return;
         }
        strlcpy(user->dhost,host,160);
-       char buffer[MAXBUF];
-       snprintf(buffer,MAXBUF,"b %s %s",user->nick,host);
-       NetSendToAll(buffer);
 }
 
 /* verify that a user's ident and nickname is valid */
@@ -284,14 +246,14 @@ int isident(const char* n)
         {
                 return 0;
         }
-        for (int i = 0; i != strlen(n); i++)
+        for (unsigned int i = 0; i < strlen(n); i++)
         {
                 if ((n[i] < 33) || (n[i] > 125))
                 {
                         return 0;
                 }
                 /* can't occur ANYWHERE in an Ident! */
-                if (strchr("<>,./?:;@'~#=+()*&%$£ \"!",n[i]))
+                if (strchr("<>,/?:;@'~#=+()*&%$£ \"!",n[i]))
                 {
                         return 0;
                 }
@@ -310,11 +272,11 @@ int isnick(const char* n)
        {
                return 0;
        }
-       if (strlen(n) > NICKMAX-1)
+       if (strlen(n) > NICKMAX)
        {
                return 0;
        }
-       for (int i = 0; i != strlen(n); i++)
+       for (unsigned int i = 0; i != strlen(n); i++)
        {
                if ((n[i] < 33) || (n[i] > 125))
                {
@@ -496,11 +458,4 @@ char* chlist(userrec *user,userrec* source)
 }
 
 
-void send_network_quit(const char* nick, const char* reason)
-{
-       char buffer[MAXBUF];
-       snprintf(buffer,MAXBUF,"Q %s :%s",nick,reason);
-       NetSendToAll(buffer);
-}
-