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 cbc52b4dde3107f534e910b45573da6f28c5bee2..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);
                }
        }
 }
@@ -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);