Author: Kev <klmitch@mit.edu>

Log message:

This should finish up conversion to the new sendcmdto_* routines except for
removing the dead (or dying) code.  Hopefully once the dead code is removed,
we'll lose a few thousand lines from channel.c alone ;)

Status: Compiles, tested
Testing needed: Brute-force literally everything

git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/trunk@234 c9e4aea6-c8fd-4c43-8297-357d70d61c8c

diff --git a/ChangeLog b/ChangeLog
index fd2e1707f07815d01e574023a3392d2cfa50aa95..df8800e45cdd5169fe9a247a4e83e888beb07648 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2000-05-04  Kevin L. Mitchell  <klmitch@mit.edu>
 
+       * ircd/channel.c (send_channel_modes): deal with one of the last
+       vestiges of sendbuf
+
        * ircd/m_burst.c (ms_burst): debugged ban processing; removed
        debugging hooks
 
@@ -1116,7 +1119,7 @@
 #
 # ChangeLog for ircu2.10.11
 #
-# $Id: ChangeLog,v 1.131 2000-05-04 15:33:35 kev Exp $
+# $Id: ChangeLog,v 1.132 2000-05-04 17:28:29 kev Exp $
 #
 # Insert new changes at beginning of the change list.
 #

diff --git a/ircd/channel.c b/ircd/channel.c
index 0e5bbb505f8c3d995ca89546c1ca7e1d9474030f..45b0189a930e39cc642a77fbbe1e3b92d55bf826 100644 (file)
--- a/ircd/channel.c
+++ b/ircd/channel.c
@@ -850,6 +850,7 @@ void send_channel_modes(struct Client *cptr, struct Channel *chptr)
   struct SLink*      lp2;
   char modebuf[MODEBUFLEN];
   char parabuf[MODEBUFLEN];
+  char sndbuf[IRC_BUFSIZE];
 
   assert(0 != cptr);
   assert(0 != chptr); 
@@ -869,21 +870,21 @@ void send_channel_modes(struct Client *cptr, struct Channel *chptr)
                                  all in one message */
 
     /* (Continued) prefix: "<Y> B <channel> <TS>" */
-    sprintf_irc(sendbuf, "%s B %s " TIME_T_FMT, NumServ(&me),
-                chptr->chname, chptr->creationtime);
-    sblen = strlen(sendbuf);
+    /* is there any better way we can do this? */
+    sblen = ircd_snprintf(&me, sndbuf, sizeof(sndbuf), "%C " TOK_BURST
+                         " %H %Tu", &me, chptr, chptr->creationtime);
 
     if (first && modebuf[1])    /* Add simple modes (iklmnpst)
                                  if first message */
     {
       /* prefix: "<Y> B <channel> <TS>[ <modes>[ <params>]]" */
-      sendbuf[sblen++] = ' ';
-      strcpy(sendbuf + sblen, modebuf);
+      sndbuf[sblen++] = ' ';
+      strcpy(sndbuf + sblen, modebuf);
       sblen += strlen(modebuf);
       if (*parabuf)
       {
-        sendbuf[sblen++] = ' ';
-        strcpy(sendbuf + sblen, parabuf);
+        sndbuf[sblen++] = ' ';
+        strcpy(sndbuf + sblen, parabuf);
         sblen += strlen(parabuf);
       }
     }
@@ -912,11 +913,11 @@ void send_channel_modes(struct Client *cptr, struct Channel *chptr)
                                  mode. --Gte */
           break;              /* Do not add this member to this message */
         }
-        sendbuf[sblen++] = first ? ' ' : ',';
+        sndbuf[sblen++] = first ? ' ' : ',';
         first = 0;              /* From now on, us comma's to add new nicks */
 
-        sprintf_irc(sendbuf + sblen, "%s%s", NumNick(member->user));
-        sblen += strlen(sendbuf + sblen);
+       sblen += ircd_snprintf(&me, sndbuf + sblen, sizeof(sndbuf) - sblen,
+                              "%C", member->user);
         /*
          * Do we have a nick with a new mode ?
          * Or are we starting a new BURST line?
@@ -925,11 +926,11 @@ void send_channel_modes(struct Client *cptr, struct Channel *chptr)
         {
           new_mode = 0;
           if (IsVoicedOrOpped(member)) {
-            sendbuf[sblen++] = ':';
+            sndbuf[sblen++] = ':';
             if (IsChanOp(member))
-              sendbuf[sblen++] = 'o';
+              sndbuf[sblen++] = 'o';
             if (HasVoice(member))
-              sendbuf[sblen++] = 'v';
+              sndbuf[sblen++] = 'v';
           }
         }
       }
@@ -955,19 +956,19 @@ void send_channel_modes(struct Client *cptr, struct Channel *chptr)
         if (first)
         {
           first = 0;
-          sendbuf[sblen++] = ' ';
-          sendbuf[sblen++] = ':';       /* Will be last parameter */
-          sendbuf[sblen++] = '%';       /* To tell bans apart */
+          sndbuf[sblen++] = ' ';
+          sndbuf[sblen++] = ':';       /* Will be last parameter */
+          sndbuf[sblen++] = '%';       /* To tell bans apart */
         }
         else
-          sendbuf[sblen++] = ' ';
-        strcpy(sendbuf + sblen, lp2->value.ban.banstr);
+          sndbuf[sblen++] = ' ';
+        strcpy(sndbuf + sblen, lp2->value.ban.banstr);
         sblen += len;
       }
     }
 
-    sendbuf[sblen] = '\0';
-    sendbufto_one(cptr);        /* Send this message */
+    sndbuf[sblen] = '\0';
+    send_buffer(cptr, sndbuf);  /* Send this message */
   }                             /* Continue when there was something
                                  that didn't fit (full==1) */
 }
@@ -1236,7 +1237,7 @@ int set_mode(struct Client* cptr, struct Client* sptr,
             break;
            }
            else {
-             sprintf_irc(sendbuf,":%s NOTICE * :*** Notice -- Deop of +k user on %s by %s",
+             sprintf_irc(sendbuf,":%s NOTICE * :*** Notice -- Deop of +k user on %s by %s", /* XXX set_mode only called by old m_mode */
                          me.name,chptr->chname,cptr->name);             
            }
         }
@@ -1965,8 +1966,8 @@ int set_mode(struct Client* cptr, struct Client* sptr,
       len[0] = strlen(ban[0]->value.ban.banstr);
       cnt = 1;                  /* We already got one ban :) */
       /* XXX sendbuf used to send ban bounces! */
-      sblen = sprintf_irc(sendbuf, ":%s MODE %s +b",
-          me.name, chptr->chname) - sendbuf;
+      sblen = sprintf_irc(sendbuf, ":%s MODE %s +b", /* XXX set_mode only called by old m_mode */
+          me.name, chptr->chname) - sendbuf; /* XXX set_mode only called by old m_mode */
       total_len = sblen + 1 + len[0];   /* 1 = ' ' */
       /* Find more bans: */
       delayed = 0;
@@ -1978,16 +1979,16 @@ int set_mode(struct Client* cptr, struct Client* sptr,
           delayed = cnt + 1;    /* != 0 */
           break;                /* Flush */
         }
-        sendbuf[sblen++] = 'b';
+        sendbuf[sblen++] = 'b'; /* XXX set_mode only called by old m_mode */
         total_len += 2 + len[cnt++];    /* 2 = "b " */
       }
       while (cnt--)
       {
-        sendbuf[sblen++] = ' ';
-        strcpy(sendbuf + sblen, ban[cnt]->value.ban.banstr);
+        sendbuf[sblen++] = ' '; /* XXX set_mode only called by old m_mode */
+        strcpy(sendbuf + sblen, ban[cnt]->value.ban.banstr); /* XXX set_mode only called by old m_mode */
         sblen += len[cnt];
       }
-      sendbufto_one(cptr);      /* Send bounce to uplink */
+      sendbufto_one(cptr);      /* Send bounce to uplink */ /* XXX set_mode only called by old m_mode */
       if (delayed)
         ban[0] = ban[delayed - 1];
     }
@@ -2003,11 +2004,11 @@ int set_mode(struct Client* cptr, struct Client* sptr,
     struct Client *acptr;
     if (IsServer(sptr))
       /* XXX sendbuf used to send ban bounces! */
-      psblen = sprintf_irc(sendbuf, ":%s MODE %s -b",
-          sptr->name, chptr->chname) - sendbuf;
+      psblen = sprintf_irc(sendbuf, ":%s MODE %s -b", /* XXX set_mode only called by old m_mode */
+          sptr->name, chptr->chname) - sendbuf; /* XXX set_mode only called by old m_mode */
     else                        /* We rely on IsRegistered(sptr) being true for MODE */
-      psblen = sprintf_irc(sendbuf, ":%s!%s@%s MODE %s -b", sptr->name,
-          sptr->user->username, sptr->user->host, chptr->chname) - sendbuf;
+      psblen = sprintf_irc(sendbuf, ":%s!%s@%s MODE %s -b", sptr->name, /* XXX set_mode only called by old m_mode */
+          sptr->user->username, sptr->user->host, chptr->chname) - sendbuf; /* XXX set_mode only called by old m_mode */
     while (delayed || (ban = next_removed_overlapped_ban()))
     {
       if (!delayed)
@@ -2029,20 +2030,20 @@ int set_mode(struct Client* cptr, struct Client* sptr,
           delayed = cnt + 1;    /* != 0 */
           break;                /* Flush */
         }
-        sendbuf[sblen++] = 'b';
+        sendbuf[sblen++] = 'b'; /* XXX set_mode only called by old m_mode */
         total_len += 2 + len[cnt++];    /* 2 = "b " */
       }
       while (cnt--)
       {
-        sendbuf[sblen++] = ' ';
-        strcpy(sendbuf + sblen, banstr[cnt]);
+        sendbuf[sblen++] = ' '; /* XXX set_mode only called by old m_mode */
+        strcpy(sendbuf + sblen, banstr[cnt]); /* XXX set_mode only called by old m_mode */
         MyFree(banstr[cnt]);
         sblen += len[cnt];
       }
       for (member_z = chptr->members; member_z; member_z = member_z->next_member) {
         acptr = member_z->user;
         if (MyConnect(acptr) && !IsZombie(member_z))
-          sendbufto_one(acptr);
+          sendbufto_one(acptr); /* XXX set_mode only called by old m_mode */
       }
       if (delayed)
       {
@@ -2314,18 +2315,18 @@ void add_token_to_sendbuf(char *token, size_t *sblenp, int *firstp,
     *firstp = 0;
     if (*send_itp == 0)
       *send_itp = 1;            /* Buffer contains data to be sent */
-    sendbuf[(*sblenp)++] = ' ';
+    sendbuf[(*sblenp)++] = ' '; /* XXX add_token_to_sendbuf only called by old m_burst */
     if (is_a_ban)
     {
-      sendbuf[(*sblenp)++] = ':';       /* Bans are always the last "parv" */
-      sendbuf[(*sblenp)++] = is_a_ban;
+      sendbuf[(*sblenp)++] = ':';       /* Bans are always the last "parv" */ /* XXX add_token_to_sendbuf only called by old m_burst */
+      sendbuf[(*sblenp)++] = is_a_ban; /* XXX add_token_to_sendbuf only called by old m_burst */
     }
   }
   else                          /* Of course, 'send_it' is already set here */
     /* Seperate banmasks with a space because
        they can contain commas themselfs: */
-    sendbuf[(*sblenp)++] = is_a_ban ? ' ' : ',';
-  strcpy(sendbuf + *sblenp, token);
+    sendbuf[(*sblenp)++] = is_a_ban ? ' ' : ','; /* XXX add_token_to_sendbuf only called by old m_burst */
+  strcpy(sendbuf + *sblenp, token); /* XXX add_token_to_sendbuf only called by old m_burst */
   *sblenp += strlen(token);
   if (!is_a_ban)                /* nick list ? Need to take care
                                    of modes for nicks: */
@@ -2337,13 +2338,13 @@ void add_token_to_sendbuf(char *token, size_t *sblenp, int *firstp,
     if (last_mode != mode)      /* Append mode like ':ov' if changed */
     {
       last_mode = mode;
-      sendbuf[(*sblenp)++] = ':';
+      sendbuf[(*sblenp)++] = ':'; /* XXX add_token_to_sendbuf only called by old m_burst */
       if (mode & CHFL_CHANOP)
-        sendbuf[(*sblenp)++] = 'o';
+        sendbuf[(*sblenp)++] = 'o'; /* XXX add_token_to_sendbuf only called by old m_burst */
       if (mode & CHFL_VOICE)
-        sendbuf[(*sblenp)++] = 'v';
+        sendbuf[(*sblenp)++] = 'v'; /* XXX add_token_to_sendbuf only called by old m_burst */
     }
-    sendbuf[*sblenp] = '\0';
+    sendbuf[*sblenp] = '\0'; /* XXX add_token_to_sendbuf only called by old m_burst */
   }
 }
 
@@ -2364,7 +2365,7 @@ void cancel_mode(struct Client *sptr, struct Channel *chptr, char m,
   {
     /* XXX sendbuf used! */
     sbp = sbpi =
-        sprintf_irc(sendbuf, ":%s MODE %s -", sptr->name, chptr->chname);
+        sprintf_irc(sendbuf, ":%s MODE %s -", sptr->name, chptr->chname); /* XXX cancel_mode only called from old ms_burst */
     pb = parabuf;
     *count = 0;
   }
@@ -2396,7 +2397,7 @@ void cancel_mode(struct Client *sptr, struct Channel *chptr, char m,
     strcpy(sbp, parabuf);
     for (member = chptr->members; member; member = member->next_member)
       if (MyUser(member->user))
-        sendbufto_one(member->user);
+        sendbufto_one(member->user); /* XXX cancel_mode only called from old ms_burst */
     sbp = sbpi;
     pb = parabuf;
     *count = 0;
@@ -2564,18 +2565,18 @@ void send_hack_notice(struct Client *cptr, struct Client *sptr, int parc,
           strcat(params, parv[i]);
         i++;
       }
-      sprintf_irc(sendbuf,
+      sprintf_irc(sendbuf, /* XXX send_hack_notice only called from old m_mode */
           ":%s NOTICE * :*** Notice -- %sHACK(%d): %s MODE %s %s%s ["
           TIME_T_FMT "]", me.name, (badop == 3) ? "BOUNCE or " : "", badop,
           parv[0], parv[1], parv[2], params, chptr->creationtime);
-      sendbufto_op_mask((badop == 3) ? SNO_HACK3 : (badop == /* XXX DYING */
+      sendbufto_op_mask((badop == 3) ? SNO_HACK3 : (badop == /* XXX DYING */ /* XXX send_hack_notice only called from old m_mode */
           4) ? SNO_HACK4 : SNO_HACK2);
 
       if ((IsServer(sptr)) && (badop == 2))
       {
-        sprintf_irc(sendbuf, ":%s DESYNCH :HACK: %s MODE %s %s%s",
+        sprintf_irc(sendbuf, ":%s DESYNCH :HACK: %s MODE %s %s%s", /* XXX send_hack_notice only called from old m_mode */
             me.name, parv[0], parv[1], parv[2], params);
-        sendbufto_serv_butone(cptr); /* XXX DYING */
+        sendbufto_serv_butone(cptr); /* XXX DYING */ /* XXX send_hack_notice only called from old m_mode */
       }
       break;
     }
@@ -2591,14 +2592,14 @@ void send_hack_notice(struct Client *cptr, struct Client *sptr, int parc,
     {
       struct Client *acptr;
       if ((acptr = findNUser(parv[2])) != NULL) /* attempt to convert nick */
-        sprintf_irc(sendbuf,
+        sprintf_irc(sendbuf, /* XXX send_hack_notice only called from old m_mode */
             ":%s NOTICE * :*** Notice -- HACK: %s KICK %s %s :%s",
             me.name, sptr->name, parv[1], acptr->name, parv[3]);
       else                      /* if conversion fails, send it 'as is' in <>'s */
-        sprintf_irc(sendbuf,
+        sprintf_irc(sendbuf, /* XXX send_hack_notice only called from old m_mode */
             ":%s NOTICE * :*** Notice -- HACK: %s KICK %s <%s> :%s",
             me.name, sptr->name, parv[1], parv[2], parv[3]);
-      sendbufto_op_mask(SNO_HACK4); /* XXX DYING */
+      sendbufto_op_mask(SNO_HACK4); /* XXX DYING */ /* XXX send_hack_notice only called from old m_mode */
       break;
     }
   }

diff --git a/ircd/m_burst.c b/ircd/m_burst.c
index 55a00f23bfb5a70eefb8cdc47b992203f9675d74..fdcb2ab46b3225b313271d382a3a92d3f0d7b7bd 100644 (file)
--- a/ircd/m_burst.c
+++ b/ircd/m_burst.c
@@ -412,13 +412,13 @@ int ms_burst(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
     if (find_conf_byhost(cptr->confs, sptr->name, CONF_UWORLD))
     {
       p =
-          sprintf_irc(sendbuf,
+          sprintf_irc(sendbuf, /* XXX DYING */
           ":%s NOTICE * :*** Notice -- HACK(4): %s BURST %s %s", me.name,
           sptr->name, parv[1], parv[2]);
       for (i = 3; i < parc - 1; ++i)
         p = sprintf_irc(p, " %s", parv[i]);
       sprintf_irc(p, " :%s", parv[parc - 1]);
-      sendbufto_op_mask(SNO_HACK4);
+      sendbufto_op_mask(SNO_HACK4); /* XXX DYING */
     }
     else
     {
@@ -475,8 +475,8 @@ int ms_burst(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
   *modebuf = '+';
   mblen2 = 1;
   cnt = 0;
-  sblen = sprintf_irc(sendbuf, "%s B %s " TIME_T_FMT,
-      NumServ(sptr), chptr->chname, chptr->creationtime) - sendbuf;
+  sblen = sprintf_irc(sendbuf, "%s B %s " TIME_T_FMT, /* XXX DYING */
+      NumServ(sptr), chptr->chname, chptr->creationtime) - sendbuf; /* XXX DYING */
 
   /* Run over all remaining parameters */
   for (n = 3; n < parc; n++)
@@ -655,15 +655,15 @@ int ms_burst(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
         }                       /* <-- while over all modes */
 
         bmodebuf[mblen] = '\0';
-        sendbuf[sblen] = '\0';
+        sendbuf[sblen] = '\0'; /* XXX DYING */
         if (mblen)              /* Anything to send at all ? */
         {
           send_it = 1;
-          strcpy(sendbuf + sblen, " +");
+          strcpy(sendbuf + sblen, " +"); /* XXX DYING */
           sblen += 2;
-          strcpy(sendbuf + sblen, bmodebuf);
+          strcpy(sendbuf + sblen, bmodebuf); /* XXX DYING */
           sblen += mblen;
-          strcpy(sendbuf + sblen, bparambuf);
+          strcpy(sendbuf + sblen, bparambuf); /* XXX DYING */
           sblen += strlen(bparambuf);
         }
         break;                  /* Done mode part */
@@ -695,7 +695,7 @@ int ms_burst(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
           if (ret != -1)
             /* A new ban was added or an existing one needs to be passed on.
              * Also add it to sendbuf: */
-            add_token_to_sendbuf(ban, &sblen, &first, &send_it, '%', 0);
+            add_token_to_sendbuf(ban, &sblen, &first, &send_it, '%', 0); /* XXX DYING */
         }
         break;                  /* Done bans part */
       }
@@ -761,7 +761,7 @@ int ms_burst(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
              * - If sendbuf is full, send it, and prepare a new
              *   message in sendbuf.
              */
-            add_token_to_sendbuf(nick, &sblen, &first, &send_it, 0,
+            add_token_to_sendbuf(nick, &sblen, &first, &send_it, 0, /* XXX DYING */
                 default_mode);
             /* Let is take effect: (Note that in the case of a netride
              * 'default_mode' is always CHFL_DEOPPED here). */
@@ -797,7 +797,7 @@ int ms_burst(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
       if (lp->value.cptr == cptr)
         continue;
       if (Protocol(lp->value.cptr) > 9)
-        sendbufto_one(lp->value.cptr);
+        sendbufto_one(lp->value.cptr); /* XXX DYING */
     }
 
     /*
@@ -814,7 +814,7 @@ int ms_burst(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
     for (member = chptr->members; member; member = member->next_member)
       if (IsBurstJoined(member))
       {
-        sendto_channel_butserv(chptr, member->user, ":%s JOIN :%s",
+        sendto_channel_butserv(chptr, member->user, ":%s JOIN :%s", /* XXX DYING */
                                member->user->name, chptr->chname);
       }
 
@@ -837,7 +837,7 @@ int ms_burst(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
               if (6 == ++cnt)
               {
                 modebuf[mblen2] = 0;
-                sendto_channel_butserv(chptr, sptr, ":%s MODE %s %s%s",
+                sendto_channel_butserv(chptr, sptr, ":%s MODE %s %s%s", /* XXX DYING */
                     parv[0], chptr->chname, modebuf, parabuf);
                 *parabuf = 0;
                 pblen2 = 0;
@@ -856,7 +856,7 @@ int ms_burst(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
       if (cnt > 0 || mblen2 > 1)
       {
         modebuf[mblen2] = 0;
-        sendto_channel_butserv(chptr, sptr, ":%s MODE %s %s%s",
+        sendto_channel_butserv(chptr, sptr, ":%s MODE %s %s%s", /* XXX DYING */
             parv[0], chptr->chname, modebuf, parabuf);
       }
     }
@@ -872,26 +872,26 @@ int ms_burst(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
 
     /* Now cancel all previous simple modes */
     if ((prev_mode & MODE_SECRET))
-      cancel_mode(sptr, chptr, 's', 0, &count);
+      cancel_mode(sptr, chptr, 's', 0, &count); /* XXX DYING */
     if ((prev_mode & MODE_PRIVATE))
-      cancel_mode(sptr, chptr, 'p', 0, &count);
+      cancel_mode(sptr, chptr, 'p', 0, &count); /* XXX DYING */
     if ((prev_mode & MODE_MODERATED))
-      cancel_mode(sptr, chptr, 'm', 0, &count);
+      cancel_mode(sptr, chptr, 'm', 0, &count); /* XXX DYING */
     if ((prev_mode & MODE_TOPICLIMIT))
-      cancel_mode(sptr, chptr, 't', 0, &count);
+      cancel_mode(sptr, chptr, 't', 0, &count); /* XXX DYING */
     if ((prev_mode & MODE_INVITEONLY))
-      cancel_mode(sptr, chptr, 'i', 0, &count);
+      cancel_mode(sptr, chptr, 'i', 0, &count); /* XXX DYING */
     if ((prev_mode & MODE_NOPRIVMSGS))
-      cancel_mode(sptr, chptr, 'n', 0, &count);
+      cancel_mode(sptr, chptr, 'n', 0, &count); /* XXX DYING */
     if ((prev_mode & MODE_LIMIT))
     {
       current_mode->limit = 0;
-      cancel_mode(sptr, chptr, 'l', 0, &count);
+      cancel_mode(sptr, chptr, 'l', 0, &count); /* XXX DYING */
     }
     if ((prev_mode & MODE_KEY))
     {
       *current_mode->key = 0;
-      cancel_mode(sptr, chptr, 'k', prev_key, &count);
+      cancel_mode(sptr, chptr, 'k', prev_key, &count); /* XXX DYING */
     }
     current_mode->mode &= ~prev_mode;
 
@@ -924,16 +924,16 @@ int ms_burst(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
                 continue;
            }
 
-           sendto_highprot_butone(0, 10, "%s " TOK_KICK " %s %s%s :Net Rider",
+           sendto_highprot_butone(0, 10, "%s " TOK_KICK " %s %s%s :Net Rider", /* XXX DYING */
             NumServ(&me), chptr->chname, NumNick(member->user));
-           sendto_channel_butserv(chptr, sptr,
+           sendto_channel_butserv(chptr, sptr, /* XXX DYING */
             ":%s KICK %s %s :Net Rider", me.name, chptr->chname,
             member->user->name);
 
            if (MyUser(member->user)) {
-             sendto_lowprot_butone(0, 9, ":%s PART %s",
+             sendto_lowprot_butone(0, 9, ":%s PART %s", /* XXX DYING */
                member->user->name, chptr->chname, member->user->name);
-             sendto_highprot_butone(0, 10, "%s%s PART %s",
+             sendto_highprot_butone(0, 10, "%s%s PART %s", /* XXX DYING */
                NumNick(member->user), chptr->chname);
              remove_user_from_channel(member->user, chptr);
            }
@@ -948,7 +948,7 @@ int ms_burst(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
           member->status &= ~mode;
           if (mode == CHFL_CHANOP)
             SetDeopped(member);
-          cancel_mode(sptr, chptr, m, member->user->name, &count);
+          cancel_mode(sptr, chptr, m, member->user->name, &count); /* XXX DYING */
         }
       }
       if (mode == CHFL_VOICE)
@@ -964,7 +964,7 @@ int ms_burst(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
         struct Membership* member_z;
 
         *ban = tmp->next;
-        cancel_mode(sptr, chptr, 'b', tmp->value.ban.banstr, &count);
+        cancel_mode(sptr, chptr, 'b', tmp->value.ban.banstr, &count); /* XXX DYING */
 
         /* Copied from del_banid(): */
         MyFree(tmp->value.ban.banstr);
@@ -984,9 +984,9 @@ int ms_burst(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
     {
       struct SLink *ban;
       while ((ban = next_removed_overlapped_ban()))
-        cancel_mode(sptr, chptr, 'b', ban->value.ban.banstr, &count);
+        cancel_mode(sptr, chptr, 'b', ban->value.ban.banstr, &count); /* XXX DYING */
     }
-    cancel_mode(sptr, chptr, 0, 0, &count);  /* flush */
+    cancel_mode(sptr, chptr, 0, 0, &count);  /* flush */ /* XXX DYING */
   }
 
   if (send_it && !netride)
@@ -1020,7 +1020,7 @@ int ms_burst(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
       {
         /* Time to send buffer */
         modebuf[mblen2] = 0;
-        sendto_channel_butserv(chptr, sptr, ":%s MODE %s %s%s",
+        sendto_channel_butserv(chptr, sptr, ":%s MODE %s %s%s", /* XXX DYING */
             parv[0], chptr->chname, modebuf, parabuf);
         *modebuf = deban ? '-' : '+';
         mblen2 = 1;
@@ -1055,7 +1055,7 @@ int ms_burst(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
     if (cnt > 0 || mblen2 > 1)
     {
       modebuf[mblen2] = 0;
-      sendto_channel_butserv(chptr, sptr, ":%s MODE %s %s%s",
+      sendto_channel_butserv(chptr, sptr, ":%s MODE %s %s%s", /* XXX DYING */
           parv[0], chptr->chname, modebuf, parabuf);
     }
   }
@@ -1127,13 +1127,13 @@ int m_burst(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
     if (find_conf_byhost(cptr->confs, sptr->name, CONF_UWORLD))
     {
       p =
-          sprintf_irc(sendbuf,
+          sprintf_irc(sendbuf, /* XXX DEAD */
           ":%s NOTICE * :*** Notice -- HACK(4): %s BURST %s %s", me.name,
           sptr->name, parv[1], parv[2]);
       for (i = 3; i < parc - 1; ++i)
         p = sprintf_irc(p, " %s", parv[i]);
       sprintf_irc(p, " :%s", parv[parc - 1]);
-      sendbufto_op_mask(SNO_HACK4);
+      sendbufto_op_mask(SNO_HACK4); /* XXX DEAD */
     }
     else
     {
@@ -1190,8 +1190,8 @@ int m_burst(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
   *modebuf = '+';
   mblen2 = 1;
   cnt = 0;
-  sblen = sprintf_irc(sendbuf, "%s B %s " TIME_T_FMT,
-      NumServ(sptr), chptr->chname, chptr->creationtime) - sendbuf;
+  sblen = sprintf_irc(sendbuf, "%s B %s " TIME_T_FMT, /* XXX DEAD */
+      NumServ(sptr), chptr->chname, chptr->creationtime) - sendbuf; /* XXX DEAD */
 
   /* Run over all remaining parameters */
   for (n = 3; n < parc; n++)
@@ -1370,15 +1370,15 @@ int m_burst(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
         }                       /* <-- while over all modes */
 
         bmodebuf[mblen] = '\0';
-        sendbuf[sblen] = '\0';
+        sendbuf[sblen] = '\0'; /* XXX DEAD */
         if (mblen)              /* Anything to send at all ? */
         {
           send_it = 1;
-          strcpy(sendbuf + sblen, " +");
+          strcpy(sendbuf + sblen, " +"); /* XXX DEAD */
           sblen += 2;
-          strcpy(sendbuf + sblen, bmodebuf);
+          strcpy(sendbuf + sblen, bmodebuf); /* XXX DEAD */
           sblen += mblen;
-          strcpy(sendbuf + sblen, bparambuf);
+          strcpy(sendbuf + sblen, bparambuf); /* XXX DEAD */
           sblen += strlen(bparambuf);
         }
         break;                  /* Done mode part */
@@ -1410,7 +1410,7 @@ int m_burst(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
           if (ret != -1)
             /* A new ban was added or an existing one needs to be passed on.
              * Also add it to sendbuf: */
-            add_token_to_sendbuf(ban, &sblen, &first, &send_it, '%', 0);
+            add_token_to_sendbuf(ban, &sblen, &first, &send_it, '%', 0); /* XXX DEAD */
         }
         break;                  /* Done bans part */
       }
@@ -1476,7 +1476,7 @@ int m_burst(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
              * - If sendbuf is full, send it, and prepare a new
              *   message in sendbuf.
              */
-            add_token_to_sendbuf(nick, &sblen, &first, &send_it, 0,
+            add_token_to_sendbuf(nick, &sblen, &first, &send_it, 0, /* XXX DEAD */
                 default_mode);
             /* Let is take effect: (Note that in the case of a netride
              * 'default_mode' is always CHFL_DEOPPED here). */
@@ -1512,7 +1512,7 @@ int m_burst(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
       if (lp->value.cptr == cptr)
         continue;
       if (Protocol(lp->value.cptr) > 9)
-        sendbufto_one(lp->value.cptr);
+        sendbufto_one(lp->value.cptr); /* XXX DEAD */
     }
 
     /*
@@ -1529,7 +1529,7 @@ int m_burst(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
     for (member = chptr->members; member; member = member->next_member)
       if (IsBurstJoined(member))
       {
-        sendto_channel_butserv(chptr, member->user, ":%s JOIN :%s",
+        sendto_channel_butserv(chptr, member->user, ":%s JOIN :%s", /* XXX DEAD */
                                member->user->name, chptr->chname);
       }
 
@@ -1552,7 +1552,7 @@ int m_burst(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
               if (6 == ++cnt)
               {
                 modebuf[mblen2] = 0;
-                sendto_channel_butserv(chptr, sptr, ":%s MODE %s %s%s",
+                sendto_channel_butserv(chptr, sptr, ":%s MODE %s %s%s", /* XXX DEAD */
                     parv[0], chptr->chname, modebuf, parabuf);
                 *parabuf = 0;
                 pblen2 = 0;
@@ -1571,7 +1571,7 @@ int m_burst(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
       if (cnt > 0 || mblen2 > 1)
       {
         modebuf[mblen2] = 0;
-        sendto_channel_butserv(chptr, sptr, ":%s MODE %s %s%s",
+        sendto_channel_butserv(chptr, sptr, ":%s MODE %s %s%s", /* XXX DEAD */
             parv[0], chptr->chname, modebuf, parabuf);
       }
     }
@@ -1587,26 +1587,26 @@ int m_burst(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
 
     /* Now cancel all previous simple modes */
     if ((prev_mode & MODE_SECRET))
-      cancel_mode(sptr, chptr, 's', 0, &count);
+      cancel_mode(sptr, chptr, 's', 0, &count); /* XXX DEAD */
     if ((prev_mode & MODE_PRIVATE))
-      cancel_mode(sptr, chptr, 'p', 0, &count);
+      cancel_mode(sptr, chptr, 'p', 0, &count); /* XXX DEAD */
     if ((prev_mode & MODE_MODERATED))
-      cancel_mode(sptr, chptr, 'm', 0, &count);
+      cancel_mode(sptr, chptr, 'm', 0, &count); /* XXX DEAD */
     if ((prev_mode & MODE_TOPICLIMIT))
-      cancel_mode(sptr, chptr, 't', 0, &count);
+      cancel_mode(sptr, chptr, 't', 0, &count); /* XXX DEAD */
     if ((prev_mode & MODE_INVITEONLY))
-      cancel_mode(sptr, chptr, 'i', 0, &count);
+      cancel_mode(sptr, chptr, 'i', 0, &count); /* XXX DEAD */
     if ((prev_mode & MODE_NOPRIVMSGS))
-      cancel_mode(sptr, chptr, 'n', 0, &count);
+      cancel_mode(sptr, chptr, 'n', 0, &count); /* XXX DEAD */
     if ((prev_mode & MODE_LIMIT))
     {
       current_mode->limit = 0;
-      cancel_mode(sptr, chptr, 'l', 0, &count);
+      cancel_mode(sptr, chptr, 'l', 0, &count); /* XXX DEAD */
     }
     if ((prev_mode & MODE_KEY))
     {
       *current_mode->key = 0;
-      cancel_mode(sptr, chptr, 'k', prev_key, &count);
+      cancel_mode(sptr, chptr, 'k', prev_key, &count); /* XXX DEAD */
     }
     current_mode->mode &= ~prev_mode;
 
@@ -1640,16 +1640,16 @@ int m_burst(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
            }
            member->status = (member->status & ~mode) | CHFL_ZOMBIE;
 
-           sendto_highprot_butone(0, 10, "%s " TOK_KICK "%s %s%s :Net Rider",
+           sendto_highprot_butone(0, 10, "%s " TOK_KICK "%s %s%s :Net Rider", /* XXX DEAD */
             NumServ(&me), chptr->chname, NumNick(member->user));
-           sendto_channel_butserv(chptr, sptr,
+           sendto_channel_butserv(chptr, sptr, /* XXX DEAD */
             ":%s KICK %s %s :Net Rider", me.name, chptr->chname,
             member->user->name);
 
            if (MyUser(member->user)) {
-             sendto_lowprot_butone(0, 9, ":%s PART %s",
+             sendto_lowprot_butone(0, 9, ":%s PART %s", /* XXX DEAD */
                member->user->name, chptr->chname, member->user->name);
-             sendto_highprot_butone(0, 10, "%s%s PART %s",
+             sendto_highprot_butone(0, 10, "%s%s PART %s", /* XXX DEAD */
                NumNick(member->user), chptr->chname);
              remove_user_from_channel(member->user, chptr);
            }
@@ -1664,7 +1664,7 @@ int m_burst(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
           member->status &= ~mode;
           if (mode == CHFL_CHANOP)
             SetDeopped(member);
-          cancel_mode(sptr, chptr, m, member->user->name, &count);
+          cancel_mode(sptr, chptr, m, member->user->name, &count); /* XXX DEAD */
         }
       }
       if (mode == CHFL_VOICE)
@@ -1680,7 +1680,7 @@ int m_burst(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
         struct Membership* member_z;
 
         *ban = tmp->next;
-        cancel_mode(sptr, chptr, 'b', tmp->value.ban.banstr, &count);
+        cancel_mode(sptr, chptr, 'b', tmp->value.ban.banstr, &count); /* XXX DEAD */
 
         /* Copied from del_banid(): */
         MyFree(tmp->value.ban.banstr);
@@ -1700,9 +1700,9 @@ int m_burst(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
     {
       struct SLink *ban;
       while ((ban = next_removed_overlapped_ban()))
-        cancel_mode(sptr, chptr, 'b', ban->value.ban.banstr, &count);
+        cancel_mode(sptr, chptr, 'b', ban->value.ban.banstr, &count); /* XXX DEAD */
     }
-    cancel_mode(sptr, chptr, 0, 0, &count);  /* flush */
+    cancel_mode(sptr, chptr, 0, 0, &count);  /* flush */ /* XXX DEAD */
   }
 
   if (send_it && !netride)
@@ -1736,7 +1736,7 @@ int m_burst(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
       {
         /* Time to send buffer */
         modebuf[mblen2] = 0;
-        sendto_channel_butserv(chptr, sptr, ":%s MODE %s %s%s",
+        sendto_channel_butserv(chptr, sptr, ":%s MODE %s %s%s", /* XXX DEAD */
             parv[0], chptr->chname, modebuf, parabuf);
         *modebuf = deban ? '-' : '+';
         mblen2 = 1;
@@ -1771,7 +1771,7 @@ int m_burst(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
     if (cnt > 0 || mblen2 > 1)
     {
       modebuf[mblen2] = 0;
-      sendto_channel_butserv(chptr, sptr, ":%s MODE %s %s%s",
+      sendto_channel_butserv(chptr, sptr, ":%s MODE %s %s%s", /* XXX DEAD */
           parv[0], chptr->chname, modebuf, parabuf);
     }
   }

diff --git a/ircd/m_desynch.c b/ircd/m_desynch.c
index de7cad80c0d86f8f7719d95d612a1adf1cb5948f..d2b2cd0bc6eac70c8662f7e9429332336f1a517a 100644 (file)
--- a/ircd/m_desynch.c
+++ b/ircd/m_desynch.c
@@ -135,7 +135,7 @@ int m_desynch(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
     int i;
     struct Client *acptr;
     /* Send message to local +g clients as if it were a wallops */
-    sprintf_irc(sendbuf, ":%s WALLOPS :%s", parv[0], parv[parc - 1]);
+    sprintf_irc(sendbuf, ":%s WALLOPS :%s", parv[0], parv[parc - 1]); /* XXX DEAD */
     for (i = 0; i <= HighestFd; i++)
       if ((acptr = LocalClientArray[i]) && !IsServer(acptr) && !IsMe(acptr) &&
           SendDebug(acptr))

diff --git a/ircd/m_userhost.c b/ircd/m_userhost.c
index a01d38ba20b9b25f2ee4a5395be7b56172ee9ff6..43886763f72264cf38700ab28cbe73ac05020ff7 100644 (file)
--- a/ircd/m_userhost.c
+++ b/ircd/m_userhost.c
@@ -141,7 +141,7 @@ int m_userhost(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
   if (parc < 2)
     return need_more_params(sptr, "USERHOST");
 
-  sbuf = sprintf_irc(sendbuf, rpl_str(RPL_USERHOST), me.name, parv[0]);
+  sbuf = sprintf_irc(sendbuf, rpl_str(RPL_USERHOST), me.name, parv[0]); /* XXX DEAD */
   for (i = j, s = ircd_strtok(&p, parv[1], " "); i && s;
       s = ircd_strtok(&p, (char *)0, " "), i--)
     if ((acptr = FindUser(s)))
@@ -157,7 +157,7 @@ int m_userhost(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
       if (i < j)
         sendbufto_one(sptr); /* XXX DEAD */
       sendto_one(sptr, err_str(ERR_NOSUCHNICK), me.name, parv[0], s); /* XXX DEAD */
-      sbuf = sprintf_irc(sendbuf, rpl_str(RPL_USERHOST), me.name, parv[0]);
+      sbuf = sprintf_irc(sendbuf, rpl_str(RPL_USERHOST), me.name, parv[0]); /* XXX DEAD */
       j = i - 1;
     }
   if (j)

diff --git a/ircd/m_userip.c b/ircd/m_userip.c
index 5fb5860bd44c12e457accf970630c211cc4aa7ed..a4b0ae78a8f7013bdc8bfbd6d40ac9667704ab28 100644 (file)
--- a/ircd/m_userip.c
+++ b/ircd/m_userip.c
@@ -137,7 +137,7 @@ int m_userip(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
   if (parc < 2)
     return need_more_params(sptr, "USERIP");
 
-  sbuf = sprintf_irc(sendbuf, rpl_str(RPL_USERIP), me.name, parv[0]);
+  sbuf = sprintf_irc(sendbuf, rpl_str(RPL_USERIP), me.name, parv[0]); /* XXX DEAD */
   for (i = j, s = ircd_strtok(&p, parv[1], " "); i && s;
       s = ircd_strtok(&p, (char *)0, " "), i--)
     if ((acptr = FindUser(s)))
@@ -153,7 +153,7 @@ int m_userip(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
       if (i < j)
         sendbufto_one(sptr); /* XXX DEAD */
       sendto_one(sptr, err_str(ERR_NOSUCHNICK), me.name, parv[0], s); /* XXX DEAD */
-      sbuf = sprintf_irc(sendbuf, rpl_str(RPL_USERIP), me.name, parv[0]);
+      sbuf = sprintf_irc(sendbuf, rpl_str(RPL_USERIP), me.name, parv[0]); /* XXX DEAD */
       j = i - 1;
     }
   if (i < j)