Missing a changeover

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

diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index f728516f90752b45b59f1cd720ce281c8d078092..cae073ff421aa0f29b181a80e7e22da2a4411adb 100644 (file)
--- a/src/helperfuncs.cpp
+++ b/src/helperfuncs.cpp
@@ -55,7 +55,6 @@ extern ServerConfig *Config;
 extern InspIRCd* ServerInstance;
 extern time_t TIME;
 extern char lowermap[255];
-static char list[MAXBUF];
 extern userrec* fd_ref_table[MAX_DESCRIPTORS];
 static char already_sent[MAX_DESCRIPTORS];
 extern std::vector<userrec*> all_opers;
@@ -715,7 +714,6 @@ void WriteCommon(userrec *u, char* text, ...)
        char textbuffer[MAXBUF];
        va_list argsPtr;
        bool sent_to_at_least_one = false;
-       unsigned int y;
 
        if (!u)
        {
@@ -735,13 +733,12 @@ void WriteCommon(userrec *u, char* text, ...)
 
        // FIX: Stops a message going to the same person more than once
        memset(&already_sent,0,MAX_DESCRIPTORS);
-       y = u->chans.size();
 
-       for (unsigned int i = 0; i < y; i++)
+       for (std::vector<ucrec*>::const_iterator v = u->chans.begin(); v != u->chans.end(); v++)
        {
-               if (u->chans[i].channel)
+               if (((ucrec*)(*v))->channel)
                {
-                       CUList *ulist= u->chans[i].channel->GetUsers();
+                       CUList *ulist= ((ucrec*)(*v))->channel->GetUsers();
 
                        for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
                        {
@@ -768,7 +765,6 @@ void WriteCommon(userrec *u, char* text, ...)
 void WriteCommon_NoFormat(userrec *u, const char* text)
 {
        bool sent_to_at_least_one = false;
-       unsigned int y;
 
        if (!u)
        {
@@ -784,13 +780,12 @@ void WriteCommon_NoFormat(userrec *u, const char* text)
 
        // FIX: Stops a message going to the same person more than once
        memset(&already_sent,0,MAX_DESCRIPTORS);
-       y = u->chans.size();
 
-       for (unsigned int i = 0; i < y; i++)
+       for (std::vector<ucrec*>::const_iterator v = u->chans.begin(); v != u->chans.end(); v++)
        {
-               if (u->chans[i].channel)
+               if (((ucrec*)(*v))->channel)
                {
-                       CUList *ulist= u->chans[i].channel->GetUsers();
+                       CUList *ulist= ((ucrec*)(*v))->channel->GetUsers();
 
                        for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
                        {
@@ -826,7 +821,6 @@ void WriteCommonExcept(userrec *u, char* text, ...)
        bool quit_munge = false;
        va_list argsPtr;
        int total;
-       unsigned int y;
 
        if (!u)
        {
@@ -886,13 +880,12 @@ void WriteCommonExcept(userrec *u, char* text, ...)
        }
 
        memset(&already_sent,0,MAX_DESCRIPTORS);
-       y = u->chans.size();
 
-       for (unsigned int i = 0; i < y; i++)
+       for (std::vector<ucrec*>::const_iterator v = u->chans.begin(); v != u->chans.end(); v++)
        {
-               if (u->chans[i].channel)
+               if (((ucrec*)(*v))->channel)
                {
-                       CUList *ulist= u->chans[i].channel->GetUsers();
+                       CUList *ulist= ((ucrec*)(*v))->channel->GetUsers();
 
                        for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
                        {
@@ -917,8 +910,6 @@ void WriteCommonExcept(userrec *u, char* text, ...)
 
 void WriteCommonExcept_NoFormat(userrec *u, const char* text)
 {
-       unsigned int y;
-
        if (!u)
        {
                log(DEFAULT,"*** BUG *** WriteCommon was given an invalid parameter");
@@ -932,13 +923,12 @@ void WriteCommonExcept_NoFormat(userrec *u, const char* text)
        }
 
        memset(&already_sent,0,MAX_DESCRIPTORS);
-       y = u->chans.size();
 
-       for (unsigned int i = 0; i < y; i++)
+       for (std::vector<ucrec*>::const_iterator v = u->chans.begin(); v != u->chans.end(); v++)
        {
-               if (u->chans[i].channel)
+               if (((ucrec*)(*v))->channel)
                {
-                       CUList *ulist= u->chans[i].channel->GetUsers();
+                       CUList *ulist= ((ucrec*)(*v))->channel->GetUsers();
 
                        for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
                        {
@@ -984,7 +974,7 @@ void WriteOpers(char* text, ...)
 
                if (IS_LOCAL(a))
                {
-                       if (strchr(a->modes,'s'))
+                       if (a->modebits & UM_SERVERNOTICE)
                        {
                                // send server notices to all with +s
                                WriteServ(a->fd,"NOTICE %s :%s",a->nick,textbuffer);
@@ -1127,7 +1117,7 @@ void WriteWallOps(userrec *source, bool local_only, char* text, ...)
        {
                userrec* t = (userrec*)(*i);
 
-               if ((IS_LOCAL(t)) && (strchr(t->modes,'w')))
+               if ((IS_LOCAL(t)) && (t->modebits & UM_WALLOPS))
                {
                        WriteTo(source,t,"WALLOPS :%s",textbuffer);
                }
@@ -1218,24 +1208,24 @@ long GetMaxBans(char* name)
 
 void purge_empty_chans(userrec* u)
 {
-       int purge = 0;
        std::vector<chanrec*> to_delete;
 
        // firstly decrement the count on each channel
        for (std::vector<ucrec*>::iterator f = u->chans.begin(); f != u->chans.end(); f++)
        {
-               ucrec* (ucrec*)*f;
-               if (f->channel)
+               if (((ucrec*)(*f))->channel)
                {
-                       if (f->channel->DelUser(u) == 0)
+                       if (((ucrec*)(*f))->channel->DelUser(u) == 0)
                        {
                                /* No users left in here, mark it for deletion */
-                               to_delete.push_back(f->channel);
-                               f->channel = NULL;
+                               to_delete.push_back(((ucrec*)(*f))->channel);
+                               ((ucrec*)(*f))->channel = NULL;
                        }
                }
        }
 
+       log(DEBUG,"purge_empty_chans: %d channels to delete",to_delete.size());
+
        for (std::vector<chanrec*>::iterator n = to_delete.begin(); n != to_delete.end(); n++)
        {
                chanrec* thischan = (chanrec*)*n;
@@ -1332,8 +1322,10 @@ void userlist(userrec *user,chanrec *c)
                return;
        }
 
+       char list[MAXBUF];
        size_t dlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, c->name);
-       size_t initial = dlen;
+       int numusers = 0;
+       char* ptr = list + dlen - 1;
 
        CUList *ulist= c->GetUsers();
 
@@ -1344,7 +1336,7 @@ void userlist(userrec *user,chanrec *c)
 
        for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
        {
-               if ((!has_user) && (strchr(i->second->modes,'i')))
+               if ((!has_user) && (i->second->modebits & UM_INVISIBLE))
                {
                        /*
                         * user is +i, and source not on the channel, does not show
@@ -1353,21 +1345,28 @@ void userlist(userrec *user,chanrec *c)
                        continue;
                }
 
-               dlen += strlcat(list,cmode(i->second,c),MAXBUF);
-               dlen += strlcat(list,i->second->nick,MAXBUF);
-               charlcat(list,' ',MAXBUF);
-               dlen++;
+               const char* n = cmode(i->second,c);
+               if (*n)
+                       *ptr++ = *n;
+               for (char* t = i->second->nick; *t; t++)
+                       *ptr++ = *t;
+               *ptr++ = ' ';
+               numusers++;
 
-               if (dlen > (480-NICKMAX))
+               if ((ptr - list) > (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);
+                       ptr = list + dlen - 1;
+                       numusers = 0;
                }
        }
+       *--ptr = 0;
 
        /* if whats left in the list isnt empty, send it */
-       if (dlen != initial)
+       if (numusers)
        {
                WriteServ_NoFormat(user->fd,list);
        }
@@ -1387,7 +1386,7 @@ int usercount_i(chanrec *c)
        CUList *ulist= c->GetUsers();
        for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
        {
-               if (!strchr(i->second->modes,'i'))
+               if (!(i->second->modebits & UM_INVISIBLE))
                        count++;
        }
 
@@ -1476,7 +1475,7 @@ int usercount_invisible(void)
 
        for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
        {
-               if ((i->second->registered == 7) && (strchr(i->second->modes,'i')))
+               if ((i->second->registered == 7) && (i->second->modebits & UM_INVISIBLE))
                        c++;
        }