Fix test client error cheecking on result types

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

diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index a94d5f9157be7bbf2fe6f142de981e2665e1f69c..02a23c0acf73ad33137d80a35db158ce54b7afdb 100644 (file)
--- a/src/helperfuncs.cpp
+++ b/src/helperfuncs.cpp
@@ -3,13 +3,13 @@
  *       +------------------------------------+
  *
  *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
+ *                    E-mail:
+ *             <brain@chatspike.net>
+ *             <Craig@chatspike.net>
  *
  * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *         the file COPYING for details.
  *
  * ---------------------------------------------------
  */
@@ -51,7 +51,7 @@ extern InspIRCd* ServerInstance;
 extern time_t TIME;
 extern char lowermap[255];
 extern userrec* fd_ref_table[MAX_DESCRIPTORS];
-static char already_sent[MAX_DESCRIPTORS];
+static unsigned long already_sent[MAX_DESCRIPTORS] = {0};
 extern std::vector<userrec*> all_opers;
 extern user_hash clientlist;
 extern chan_hash chanlist;
@@ -63,6 +63,9 @@ extern std::vector<userrec*> local_users;
 static char TIMESTR[26];
 static time_t LAST = 0;
 
+/* XXX: Used for speeding up WriteCommon operations */
+unsigned long uniq_id = 0;
+
 /** log()
  *  Write a line of text `text' to the logfile (and stdout, if in nofork) if the level `level'
  *  is greater than the configured loglevel.
@@ -706,8 +709,8 @@ void WriteCommon(userrec *u, char* text, ...)
        vsnprintf(textbuffer, MAXBUF, text, argsPtr);
        va_end(argsPtr);
 
-       // FIX: Stops a message going to the same person more than once
-       memset(&already_sent,0,MAX_DESCRIPTORS);
+       // XXX: Save on memset calls by using an ID. This clever trick thought of during discussion with nazzy and w00t.
+       uniq_id++;
 
        for (std::vector<ucrec*>::const_iterator v = u->chans.begin(); v != u->chans.end(); v++)
        {
@@ -717,9 +720,9 @@ void WriteCommon(userrec *u, char* text, ...)
 
                        for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
                        {
-                               if ((i->second->fd > -1) && (!already_sent[i->second->fd]))
+                               if ((i->second->fd > -1) && (already_sent[i->second->fd] != uniq_id))
                                {
-                                       already_sent[i->second->fd] = 1;
+                                       already_sent[i->second->fd] = uniq_id;
                                        WriteFrom_NoFormat(i->second->fd,u,textbuffer);
                                        sent_to_at_least_one = true;
                                }
@@ -753,8 +756,8 @@ void WriteCommon_NoFormat(userrec *u, const char* text)
                return;
        }
 
-       // FIX: Stops a message going to the same person more than once
-       memset(&already_sent,0,MAX_DESCRIPTORS);
+       // XXX: See comment in WriteCommon
+       uniq_id++;
 
        for (std::vector<ucrec*>::const_iterator v = u->chans.begin(); v != u->chans.end(); v++)
        {
@@ -764,9 +767,9 @@ void WriteCommon_NoFormat(userrec *u, const char* text)
 
                        for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
                        {
-                               if ((i->second->fd > -1) && (!already_sent[i->second->fd]))
+                               if ((i->second->fd > -1) && (already_sent[i->second->fd] != uniq_id))
                                {
-                                       already_sent[i->second->fd] = 1;
+                                       already_sent[i->second->fd] = uniq_id;
                                        WriteFrom_NoFormat(i->second->fd,u,text);
                                        sent_to_at_least_one = true;
                                }
@@ -854,7 +857,7 @@ void WriteCommonExcept(userrec *u, char* text, ...)
                }
        }
 
-       memset(&already_sent,0,MAX_DESCRIPTORS);
+       uniq_id++;
 
        for (std::vector<ucrec*>::const_iterator v = u->chans.begin(); v != u->chans.end(); v++)
        {
@@ -866,9 +869,9 @@ void WriteCommonExcept(userrec *u, char* text, ...)
                        {
                                if (u != i->second)
                                {
-                                       if ((i->second->fd > -1) && (!already_sent[i->second->fd]))
+                                       if ((i->second->fd > -1) && (already_sent[i->second->fd] != uniq_id))
                                        {
-                                               already_sent[i->second->fd] = 1;
+                                               already_sent[i->second->fd] = uniq_id;
 
                                                if (quit_munge)
                                                {
@@ -897,7 +900,7 @@ void WriteCommonExcept_NoFormat(userrec *u, const char* text)
                return;
        }
 
-       memset(&already_sent,0,MAX_DESCRIPTORS);
+       uniq_id++;
 
        for (std::vector<ucrec*>::const_iterator v = u->chans.begin(); v != u->chans.end(); v++)
        {
@@ -909,9 +912,9 @@ void WriteCommonExcept_NoFormat(userrec *u, const char* text)
                        {
                                if (u != i->second)
                                {
-                                       if ((i->second->fd > -1) && (!already_sent[i->second->fd]))
+                                       if ((i->second->fd > -1) && (already_sent[i->second->fd] != uniq_id))
                                        {
-                                               already_sent[i->second->fd] = 1;
+                                               already_sent[i->second->fd] = uniq_id;
                                                WriteFrom_NoFormat(i->second->fd,u,text);
                                        }
                                }
@@ -1211,13 +1214,14 @@ void purge_empty_chans(userrec* u)
        // firstly decrement the count on each channel
        for (std::vector<ucrec*>::iterator f = u->chans.begin(); f != u->chans.end(); f++)
        {
-               if (((ucrec*)(*f))->channel)
+               ucrec* uc = (ucrec*)(*f);
+               if (uc->channel)
                {
-                       if (((ucrec*)(*f))->channel->DelUser(u) == 0)
+                       if (uc->channel->DelUser(u) == 0)
                        {
                                /* No users left in here, mark it for deletion */
-                               to_delete.push_back(((ucrec*)(*f))->channel);
-                               ((ucrec*)(*f))->channel = NULL;
+                               to_delete.push_back(uc->channel);
+                               uc->channel = NULL;
                        }
                }
        }
@@ -1547,9 +1551,6 @@ long local_count()
 
 void ShowMOTD(userrec *user)
 {
-       static char mbuf[MAXBUF];
-       static char crud[MAXBUF];
-
        if (!Config->MOTD.size())
        {
                WriteServ(user->fd,"422 %s :Message of the day file is missing.",user->nick);
@@ -1558,7 +1559,7 @@ void ShowMOTD(userrec *user)
        WriteServ(user->fd,"375 %s :%s message of the day", user->nick, Config->ServerName);
 
        for (unsigned int i = 0; i < Config->MOTD.size(); i++)
-               WriteServ(user->fd,"372 %s :- ",user->nick,Config->MOTD[i].c_str());
+               WriteServ(user->fd,"372 %s :- %s",user->nick,Config->MOTD[i].c_str());
 
        WriteServ(user->fd,"376 %s :End of message of the day.", user->nick);
 }
@@ -1870,7 +1871,7 @@ void LoadAllModules(InspIRCd* ServerInstance)
                Config->ConfValue(Config->config_data, "module","name",count,configToken,MAXBUF);
                printf("[\033[1;32m*\033[0m] Loading module:\t\033[1;32m%s\033[0m\n",configToken);
                
-               if (!ServerInstance->LoadModule(configToken))                
+               if (!ServerInstance->LoadModule(configToken))           
                {
                        log(DEFAULT,"Exiting due to a module loader error.");
                        printf("\nThere was an error loading a module: %s\n\n",ServerInstance->ModuleError());