Removal of ancient TRUE/FALSE #defines (C-ish stuff)

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

diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index a02d19702272f97fe09fa4cd8c1e4bc2c879d5ec..c910e0f2b89f38fdbbadd456d50f2562c7141c5d 100644 (file)
--- a/src/helperfuncs.cpp
+++ b/src/helperfuncs.cpp
@@ -989,15 +989,18 @@ void ServerNoticeAll(char* text, ...)
                return;
 
        char textbuffer[MAXBUF];
+       char formatbuffer[MAXBUF];
        va_list argsPtr;
        va_start (argsPtr, text);
        vsnprintf(textbuffer, MAXBUF, text, argsPtr);
        va_end(argsPtr);
 
+       snprintf(formatbuffer,MAXBUF,"NOTICE $%s :%s",Config->ServerName,textbuffer);
+
        for (std::vector<userrec*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
        {
                userrec* t = (userrec*)(*i);
-               WriteServ(t->fd,"NOTICE $%s :%s",Config->ServerName,textbuffer);
+               WriteServ_NoFormat(t->fd,formatbuffer);
        }
 }
 
@@ -1007,15 +1010,18 @@ void ServerPrivmsgAll(char* text, ...)
                return;
 
        char textbuffer[MAXBUF];
+       char formatbuffer[MAXBUF];
        va_list argsPtr;
        va_start (argsPtr, text);
        vsnprintf(textbuffer, MAXBUF, text, argsPtr);
        va_end(argsPtr);
 
+       snprintf(formatbuffer,MAXBUF,"NOTICE $%s :%s",Config->ServerName,textbuffer);
+
        for (std::vector<userrec*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
        {
                userrec* t = (userrec*)(*i);
-               WriteServ(t->fd,"PRIVMSG $%s :%s",Config->ServerName,textbuffer);
+               WriteServ_NoFormat(t->fd,formatbuffer);
        }
 }
 
@@ -1078,6 +1084,7 @@ void WriteMode(const char* modes, int flags, const char* text, ...)
 void NoticeAll(userrec *source, bool local_only, char* text, ...)
 {
        char textbuffer[MAXBUF];
+       char formatbuffer[MAXBUF];
        va_list argsPtr;
 
        if ((!text) || (!source))
@@ -1090,10 +1097,12 @@ void NoticeAll(userrec *source, bool local_only, char* text, ...)
        vsnprintf(textbuffer, MAXBUF, text, argsPtr);
        va_end(argsPtr);
 
+       snprintf(formatbuffer,MAXBUF,"NOTICE $* :%s",textbuffer);
+
        for (std::vector<userrec*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
        {
                userrec* t = (userrec*)(*i);
-               WriteFrom(t->fd,source,"NOTICE $* :%s",textbuffer);
+               WriteFrom_NoFormat(t->fd,source,formatbuffer);
        }
 }
 
@@ -1101,6 +1110,7 @@ void NoticeAll(userrec *source, bool local_only, char* text, ...)
 void WriteWallOps(userrec *source, bool local_only, char* text, ...)
 {
        char textbuffer[MAXBUF];
+       char formatbuffer[MAXBUF];
        va_list argsPtr;
 
        if ((!text) || (!source))
@@ -1113,13 +1123,15 @@ void WriteWallOps(userrec *source, bool local_only, char* text, ...)
        vsnprintf(textbuffer, MAXBUF, text, argsPtr);
        va_end(argsPtr);
 
+       snprintf(formatbuffer,MAXBUF,"WALLOPS :%s",textbuffer);
+
        for (std::vector<userrec*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
        {
                userrec* t = (userrec*)(*i);
 
                if ((IS_LOCAL(t)) && (t->modebits & UM_WALLOPS))
                {
-                       WriteTo(source,t,"WALLOPS :%s",textbuffer);
+                       WriteTo_NoFormat(source,t,formatbuffer);
                }
        }
 }
@@ -1144,7 +1156,7 @@ void strlower(char *n)
 
 /* Find a user record by nickname and return a pointer to it */
 
-userrec* Find(std::string nick)
+userrec* Find(const std::string &nick)
 {
        user_hash::iterator iter = clientlist.find(nick);
 
@@ -1248,6 +1260,7 @@ char* chanmodes(chanrec *chan, bool showkey)
        static char scratch[MAXBUF];
        static char sparam[MAXBUF];
        char* offset = scratch;
+       std::string extparam = "";
 
        if (!chan)
        {
@@ -1259,43 +1272,33 @@ char* chanmodes(chanrec *chan, bool showkey)
        *scratch = '\0';
        *sparam = '\0';
 
-       if (chan->binarymodes & CM_NOEXTERNAL)
-               *offset++ = 'n';
-       if (chan->binarymodes & CM_TOPICLOCK)
-               *offset++ = 't';
-       if (*chan->key)
-               *offset++ = 'k';
-       if (chan->limit)
-               *offset++ = 'l';
-       if (chan->binarymodes & CM_INVITEONLY)
-               *offset++ = 'i';
-       if (chan->binarymodes & CM_MODERATED)
-               *offset++ = 'm';
-       if (chan->binarymodes & CM_SECRET)
-               *offset++ = 's';
-       if (chan->binarymodes & CM_PRIVATE)
-               *offset++ = 'p';
-
-       if (*chan->key)
-       {
-               snprintf(sparam,MAXBUF," %s",showkey ? chan->key : "<key>");
-       }
-
-       if (chan->limit)
-       {
-               char foo[24];
-               sprintf(foo," %lu",(unsigned long)chan->limit);
-               strlcat(sparam,foo,MAXBUF);
-       }
-
        /* This was still iterating up to 190, chanrec::custom_modes is only 64 elements -- Om */
        for(int n = 0; n < 64; n++)
        {
-               if(chan->custom_modes[n])
+               if(chan->modes[n])
                {
                        *offset++ = n+65;
-                       std::string extparam = chan->GetModeParameter(n+65);
-
+                       extparam = "";
+                       switch (n)
+                       {
+                               case CM_KEY:
+                                       extparam = (showkey ? chan->key : "<key>");
+                               break;
+                               case CM_LIMIT:
+                                       extparam = ConvToStr(chan->limit);
+                               break;
+                               case CM_NOEXTERNAL:
+                               case CM_TOPICLOCK:
+                               case CM_INVITEONLY:
+                               case CM_MODERATED:
+                               case CM_SECRET:
+                               case CM_PRIVATE:
+                                       /* We know these have no parameters */
+                               break;
+                               default:
+                                       extparam = chan->GetModeParameter(n+65);
+                               break;
+                       }
                        if (extparam != "")
                        {
                                charlcat(sparam,' ',MAXBUF);
@@ -1323,8 +1326,11 @@ void userlist(userrec *user,chanrec *c)
        }
 
        char list[MAXBUF];
-       size_t dlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, c->name);
-       int n = 0;
+       size_t dlen, curlen;
+
+       dlen = curlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, c->name);
+
+       int numusers = 0;
        char* ptr = list + dlen;
 
        CUList *ulist= c->GetUsers();
@@ -1345,28 +1351,29 @@ void userlist(userrec *user,chanrec *c)
                        continue;
                }
 
-               const char* n = cmode(i->second,c);
-               if (*n)
-                       *ptr++ = *n;
-               for (char* t = i->second->nick; *t; t++)
-                       *ptr++ = *t;
-               *ptr++ = ' ';
-               n++;
+               size_t ptrlen = snprintf(ptr, MAXBUF, "%s%s ", cmode(i->second, c), i->second->nick);
 
-               if ((ptr - list) > (480-NICKMAX))
+               curlen += ptrlen;
+               ptr += ptrlen;
+
+               numusers++;
+
+               if (curlen > (480-NICKMAX))
                {
                        /* list overflowed into multiple numerics */
-                       *--ptr = 0;
                        WriteServ_NoFormat(user->fd,list);
-                       dlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, c->name);
+
+                       /* reset our lengths */
+                       dlen = curlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, c->name);
                        ptr = list + dlen;
-                       n = 0;
+
+                       ptrlen = 0;
+                       numusers = 0;
                }
        }
-       *--ptr = 0;
 
        /* if whats left in the list isnt empty, send it */
-       if (n)
+       if (numusers)
        {
                WriteServ_NoFormat(user->fd,list);
        }
@@ -1386,7 +1393,7 @@ int usercount_i(chanrec *c)
        CUList *ulist= c->GetUsers();
        for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
        {
-               if (i->second->modebits & UM_INVISIBLE)
+               if (!(i->second->modebits & UM_INVISIBLE))
                        count++;
        }