ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/svn/ircd-hybrid/trunk/src/channel.c
(Generate patch)

Comparing ircd-hybrid/trunk/src/channel.c (file contents):
Revision 1751 by michael, Wed Jan 16 18:30:52 2013 UTC vs.
Revision 1793 by michael, Sun Mar 31 14:06:08 2013 UTC

# Line 33 | Line 33
33   #include "conf.h"
34   #include "hostmask.h"
35   #include "irc_string.h"
36 – #include "sprintf_irc.h"
36   #include "ircd.h"
37   #include "numeric.h"
38   #include "s_serv.h"             /* captab */
# Line 159 | Line 158 | send_members(struct Client *client_p, st
158    int tlen;              /* length of text to append */
159    char *t, *start;       /* temp char pointer */
160  
161 <  start = t = buf + ircsprintf(buf, ":%s SJOIN %lu %s %s %s:",
162 <                               ID_or_name(&me, client_p),
163 <                               (unsigned long)chptr->channelts,
164 <                               chptr->chname, lmodebuf, lparabuf);
161 >  start = t = buf + sprintf(buf, ":%s SJOIN %lu %s %s %s:",
162 >                            ID_or_name(&me, client_p),
163 >                            (unsigned long)chptr->channelts,
164 >                            chptr->chname, lmodebuf, lparabuf);
165  
166    DLINK_FOREACH(ptr, chptr->members.head)
167    {
# Line 232 | Line 231 | send_mode_list(struct Client *client_p,
231      return;
232  
233    if (ts5)
234 <    mlen = ircsprintf(buf, ":%s MODE %s +", me.name, chptr->chname);
234 >    mlen = sprintf(buf, ":%s MODE %s +", me.name, chptr->chname);
235    else
236 <    mlen = ircsprintf(buf, ":%s BMASK %lu %s %c :", me.id,
237 <                      (unsigned long)chptr->channelts, chptr->chname, flag);
236 >    mlen = sprintf(buf, ":%s BMASK %lu %s %c :", me.id,
237 >                   (unsigned long)chptr->channelts, chptr->chname, flag);
238  
239    /* MODE needs additional one byte for space between buf and pbuf */
240    cur_len = mlen + ts5;
# Line 273 | Line 272 | send_mode_list(struct Client *client_p,
272        *mp = '\0';
273      }
274  
275 <    pp += ircsprintf(pp, "%s!%s@%s ", banptr->name, banptr->username,
276 <                     banptr->host);
275 >    pp += sprintf(pp, "%s!%s@%s ", banptr->name, banptr->username,
276 >                  banptr->host);
277      cur_len += tlen;
278    }
279  
# Line 444 | Line 443 | channel_member_names(struct Client *sour
443  
444    if (PubChannel(chptr) || is_member)
445    {
446 <    t = lbuf + ircsprintf(lbuf, form_str(RPL_NAMREPLY),
447 <                          me.name, source_p->name,
448 <                          channel_pub_or_secret(chptr),
449 <                          chptr->chname);
446 >    t = lbuf + sprintf(lbuf, form_str(RPL_NAMREPLY),
447 >                       me.name, source_p->name,
448 >                       channel_pub_or_secret(chptr),
449 >                       chptr->chname);
450      start = t;
451  
452      DLINK_FOREACH(ptr, chptr->members.head)
# Line 482 | Line 481 | channel_member_names(struct Client *sour
481          t = start;
482        }
483  
484 <      t += ircsprintf(t, "%s%s ", get_member_status(ms, multi_prefix),
485 <                      target_p->name);
484 >      t += sprintf(t, "%s%s ", get_member_status(ms, multi_prefix),
485 >                   target_p->name);
486      }
487  
488      if (tlen != 0)

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)