diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/bots.cpp | 2 | ||||
-rw-r--r-- | src/channels.c | 4 | ||||
-rw-r--r-- | src/chanserv.c | 8 | ||||
-rw-r--r-- | src/core/cs_topic.c | 2 | ||||
-rw-r--r-- | src/core/os_set.c | 2 | ||||
-rw-r--r-- | src/ircd.c | 13 | ||||
-rw-r--r-- | src/modules/cs_appendtopic.c | 2 | ||||
-rw-r--r-- | src/protocol/charybdis.c | 2 | ||||
-rw-r--r-- | src/protocol/charybdis.h | 2 | ||||
-rw-r--r-- | src/protocol/ratbox.c | 2 | ||||
-rw-r--r-- | src/protocol/ratbox.h | 2 |
11 files changed, 14 insertions, 27 deletions
diff --git a/src/bots.cpp b/src/bots.cpp index 5195b23cf..ac22589d5 100644 --- a/src/bots.cpp +++ b/src/bots.cpp @@ -108,7 +108,7 @@ void BotInfo::UnAssign(User *u, ChannelInfo *ci) send_event(EVENT_BOT_UNASSIGN, 2, ci->name, ci->bi->nick); if (u && ci->c && ci->c->usercount >= BSMinUsers) - anope_SendPart(ci->bi->nick, ci->name, "UNASSIGN from %s", u->nick); + ircdproto->SendPart(ci->bi->nick, ci->name, "UNASSIGN from %s", u->nick); ci->bi->chancount--; ci->bi = NULL; diff --git a/src/channels.c b/src/channels.c index 97d2e698a..ad1219293 100644 --- a/src/channels.c +++ b/src/channels.c @@ -49,7 +49,7 @@ void chan_deluser(User * user, Channel * c) c->usercount--; if (s_BotServ && c->ci && c->ci->bi && c->usercount == BSMinUsers - 1) { - anope_SendPart(c->ci->bi->nick, c->name, NULL); + ircdproto->SendPart(c->ci->bi->nick, c->name, NULL); } if (!c->users) @@ -790,7 +790,7 @@ void do_sjoin(const char *source, int ac, const char **av) } if (c->ci && c->ci->bi) { /* This is ugly, but it always works */ - anope_SendPart(c->ci->bi->nick, c->name, "TS reop"); + ircdproto->SendPart(c->ci->bi->nick, c->name, "TS reop"); bot_join(c->ci); } /* XXX simple modes and bans */ diff --git a/src/chanserv.c b/src/chanserv.c index d5296ec43..3472db927 100644 --- a/src/chanserv.c +++ b/src/chanserv.c @@ -1244,7 +1244,7 @@ static void timeout_leave(Timeout * to) if (ci) /* Check cos the channel may be dropped in the meantime */ ci->flags &= ~CI_INHABIT; - anope_SendPart(s_ChanServ, chan, NULL); + ircdproto->SendPart(s_ChanServ, chan, NULL); free(to->data); } @@ -1456,7 +1456,7 @@ void restore_topic(const char *chan) c->topic ? c->topic : "", c->topic_time); if (ircd->join2set) { if (whosends(ci) == s_ChanServ) { - anope_SendPart(s_ChanServ, c->name, NULL); + ircdproto->SendPart(s_ChanServ, c->name, NULL); } } } @@ -1520,7 +1520,7 @@ int check_topiclock(Channel * c, time_t topic_time) if (ircd->join2set) { if (whosends(ci) == s_ChanServ) { - anope_SendPart(s_ChanServ, c->ci->name, NULL); + ircdproto->SendPart(s_ChanServ, c->ci->name, NULL); } } return 1; @@ -1778,7 +1778,7 @@ int delchan(ChannelInfo * ci) } if (ci->c) { if (ci->bi && ci->c->usercount >= BSMinUsers) { - anope_SendPart(ci->bi->nick, ci->c->name, NULL); + ircdproto->SendPart(ci->bi->nick, ci->c->name, NULL); } ci->c->ci = NULL; } diff --git a/src/core/cs_topic.c b/src/core/cs_topic.c index 6a89945bb..c65602fa9 100644 --- a/src/core/cs_topic.c +++ b/src/core/cs_topic.c @@ -111,7 +111,7 @@ int do_cs_topic(User * u) c->topic_time); if (ircd->join2set) { if (whosends(ci) == s_ChanServ) { - anope_SendPart(s_ChanServ, c->name, NULL); + ircdproto->SendPart(s_ChanServ, c->name, NULL); } } } diff --git a/src/core/os_set.c b/src/core/os_set.c index 9b9001d83..28d66fe5c 100644 --- a/src/core/os_set.c +++ b/src/core/os_set.c @@ -195,7 +195,7 @@ int do_set(User * u) } else if (LogChannel && (stricmp(setting, "off") == 0)) { alog("No longer sending log messages to a channel"); if (ircd->join2msg) { - anope_SendPart(s_GlobalNoticer, LogChannel, NULL); + ircdproto->SendPart(s_GlobalNoticer, LogChannel, NULL); } logchan = 0; notice_lang(s_OperServ, u, OPER_SET_LOGCHAN_OFF); diff --git a/src/ircd.c b/src/ircd.c index 14d099b1c..41710389a 100644 --- a/src/ircd.c +++ b/src/ircd.c @@ -43,19 +43,6 @@ void anope_ProcessUsermodes(User *user, int ac, const char **av) ircdproto->ProcessUsermodes(user, ac, av); } -void anope_SendPart(const char *nick, const char *chan, const char *fmt, ...) -{ - if (fmt) { - va_list args; - char buf[BUFSIZE] = ""; - va_start(args, fmt); - vsnprintf(buf, BUFSIZE - 1, fmt, args); - va_end(args); - ircdproto->SendPart(nick, chan, buf); - } - else ircdproto->SendPart(nick, chan, NULL); -} - void anope_SendGlobops(const char *source, const char *fmt, ...) { va_list args; diff --git a/src/modules/cs_appendtopic.c b/src/modules/cs_appendtopic.c index ff84c6330..12678cd7f 100644 --- a/src/modules/cs_appendtopic.c +++ b/src/modules/cs_appendtopic.c @@ -154,7 +154,7 @@ int my_cs_appendtopic(User * u) ircdproto->SendTopic(whosends(ci), c->name, u->nick, topic, c->topic_time); if (ircd->join2set) { if (whosends(ci) == s_ChanServ) { - anope_SendPart(s_ChanServ, c->name, NULL); + ircdproto->SendPart(s_ChanServ, c->name, NULL); } } } diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c index 89b79ee65..840e35521 100644 --- a/src/protocol/charybdis.c +++ b/src/protocol/charybdis.c @@ -813,7 +813,7 @@ void CharybdisProto::SendClientIntroduction(const char *nick, const char *user, SendSQLine(nick, "Reserved for services"); } -void CharybdisProto::SendPart(const char *nick, const char *chan, const char *buf) +void CharybdisProto::SendPartInternal(const char *nick, const char *chan, const char *buf) { User *u = finduser(nick); if (buf) send_cmd(UseTS6 ? u->uid : nick, "PART %s :%s", chan, buf); diff --git a/src/protocol/charybdis.h b/src/protocol/charybdis.h index 9098c7ef9..2a9332de7 100644 --- a/src/protocol/charybdis.h +++ b/src/protocol/charybdis.h @@ -52,6 +52,7 @@ class CharybdisProto : public IRCDTS6Proto { void SendKickInternal(const char *, const char *, const char *, const char *); void SendNoticeChanopsInternal(const char *, const char *, const char *); void SendQuitInternal(const char *, const char *); + void SendPartInternal(const char *, const char *, const char *); public: void SendAkillDel(const char *, const char *); void SendVhostDel(User *); @@ -63,7 +64,6 @@ class CharybdisProto : public IRCDTS6Proto { void SendJoin(const char *, const char *, time_t); void SendSQLineDel(const char *); void SendInvite(const char *, const char *, const char *); - void SendPart(const char *, const char *, const char *); void SendGlobops(const char *, const char *); void SendSQLine(const char *, const char *); void SendForceNickChange(const char *, const char *, time_t); diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c index 8145d26c8..b58d63688 100644 --- a/src/protocol/ratbox.c +++ b/src/protocol/ratbox.c @@ -750,7 +750,7 @@ void RatboxProto::SendClientIntroduction(const char *nick, const char *user, con SendSQLine(nick, "Reserved for services"); } -void RatboxProto::SendPart(const char *nick, const char *chan, const char *buf) +void RatboxProto::SendPartInternal(const char *nick, const char *chan, const char *buf) { Uid *ud = find_uid(nick); if (buf) send_cmd(UseTS6 ? ud->uid : nick, "PART %s :%s", chan, buf); diff --git a/src/protocol/ratbox.h b/src/protocol/ratbox.h index f4f99dcb4..2466c0a3d 100644 --- a/src/protocol/ratbox.h +++ b/src/protocol/ratbox.h @@ -51,6 +51,7 @@ class RatboxProto : public IRCDTS6Proto { void SendKickInternal(const char *, const char *, const char *, const char *); void SendNoticeChanopsInternal(const char *, const char *, const char *); void SendQuitInternal(const char *, const char *); + void SendPartInternal(const char *, const char *, const char *); public: void SendAkillDel(const char *, const char *); void SendAkill(const char *, const char *, const char *, time_t, time_t, const char *); @@ -61,7 +62,6 @@ class RatboxProto : public IRCDTS6Proto { void SendJoin(const char *, const char *, time_t); void SendSQLineDel(const char *); void SendInvite(const char *, const char *, const char *); - void SendPart(const char *, const char *, const char *); void SendGlobops(const char *, const char *); void SendSQLine(const char *, const char *); void SendForceNickChange(const char *, const char *, time_t) { } // Ratbox doesn't have an SVSNICK command |