diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/bs_bot.c | 4 | ||||
| -rw-r--r-- | src/ircd.c | 12 | ||||
| -rw-r--r-- | src/nickserv.c | 4 | ||||
| -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 |
7 files changed, 8 insertions, 20 deletions
diff --git a/src/core/bs_bot.c b/src/core/bs_bot.c index d15f00dc5..901b7af79 100644 --- a/src/core/bs_bot.c +++ b/src/core/bs_bot.c @@ -297,7 +297,7 @@ int do_bot(User * u) anope_SendChangeBotNick(oldnick, bi->nick); anope_SendSQLine(bi->nick, "Reserved for services"); } else { - anope_SendQuit(oldnick, "Quit: Be right back"); + ircdproto->SendQuit(oldnick, "Quit: Be right back"); ircdproto->SendClientIntroduction(bi->nick, bi->user, bi->host, bi->real, ircd->botserv_bot_mode); @@ -320,7 +320,7 @@ int do_bot(User * u) notice_lang(s_BotServ, u, BOT_DOES_NOT_EXIST, nick); else { send_event(EVENT_BOT_DEL, 1, bi->nick); - anope_SendQuit(bi->nick, + ircdproto->SendQuit(bi->nick, "Quit: Help! I'm being deleted by %s!", u->nick); if (ircd->sqline) { diff --git a/src/ircd.c b/src/ircd.c index 961c2aee1..818becd50 100644 --- a/src/ircd.c +++ b/src/ircd.c @@ -43,18 +43,6 @@ void anope_ProcessUsermodes(User *user, int ac, const char **av) ircdproto->ProcessUsermodes(user, ac, av); } -void anope_SendQuit(const char *source, const char *fmt, ...) -{ - va_list args; - char buf[BUFSIZE] = ""; - if (fmt) { - va_start(args, fmt); - vsnprintf(buf, BUFSIZE - 1, fmt, args); - va_end(args); - } - ircdproto->SendQuit(source, buf); -} - void anope_SendPong(const char *servname, const char *who) { ircdproto->SendPong(servname, who); diff --git a/src/nickserv.c b/src/nickserv.c index 0a8fec390..d064dd032 100644 --- a/src/nickserv.c +++ b/src/nickserv.c @@ -1576,10 +1576,10 @@ void release(NickAlias * na, int from_timeout) if (UseSVSHOLD) { anope_SendSVSHOLDDel(na->nick); } else { - anope_SendQuit(na->nick, NULL); + ircdproto->SendQuit(na->nick, NULL); } } else { - anope_SendQuit(na->nick, NULL); + ircdproto->SendQuit(na->nick, NULL); } na->status &= ~NS_KILL_HELD; } diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c index c36e18a25..89b79ee65 100644 --- a/src/protocol/charybdis.c +++ b/src/protocol/charybdis.c @@ -1036,7 +1036,7 @@ void CharybdisProto::SendBotOp(const char *nick, const char *chan) } /* QUIT */ -void CharybdisProto::SendQuit(const char *source, const char *buf) +void CharybdisProto::SendQuitInternal(const char *source, const char *buf) { BotInfo *bi = findbot(source); if (buf) send_cmd(UseTS6 ? (bi ? bi->uid.c_str() : source) : source, "QUIT :%s", buf); diff --git a/src/protocol/charybdis.h b/src/protocol/charybdis.h index ac41d22a2..9098c7ef9 100644 --- a/src/protocol/charybdis.h +++ b/src/protocol/charybdis.h @@ -51,6 +51,7 @@ class CharybdisProto : public IRCDTS6Proto { void SendModeInternal(const char *, const char *, const char *); void SendKickInternal(const char *, const char *, const char *, const char *); void SendNoticeChanopsInternal(const char *, const char *, const char *); + void SendQuitInternal(const char *, const char *); public: void SendAkillDel(const char *, const char *); void SendVhostDel(User *); @@ -58,7 +59,6 @@ class CharybdisProto : public IRCDTS6Proto { void SendSVSMode(User *, int, const char **); void SendClientIntroduction(const char *, const char *, const char *, const char *, const char *); void SendBotOp(const char *, const char *); - void SendQuit(const char *, const char *); void SendPong(const char *, const char *); void SendJoin(const char *, const char *, time_t); void SendSQLineDel(const char *); diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c index 717c71f92..8145d26c8 100644 --- a/src/protocol/ratbox.c +++ b/src/protocol/ratbox.c @@ -965,7 +965,7 @@ void RatboxProto::SendBotOp(const char *nick, const char *chan) } /* QUIT */ -void RatboxProto::SendQuit(const char *source, const char *buf) +void RatboxProto::SendQuitInternal(const char *source, const char *buf) { Uid *ud = find_uid(source); if (buf) send_cmd(UseTS6 ? (ud ? ud->uid : source) : source, "QUIT :%s", buf); diff --git a/src/protocol/ratbox.h b/src/protocol/ratbox.h index 3a8a96e1e..f4f99dcb4 100644 --- a/src/protocol/ratbox.h +++ b/src/protocol/ratbox.h @@ -50,13 +50,13 @@ class RatboxProto : public IRCDTS6Proto { void SendModeInternal(const char *, const char *, const char *); void SendKickInternal(const char *, const char *, const char *, const char *); void SendNoticeChanopsInternal(const char *, const char *, const char *); + void SendQuitInternal(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 *); void SendSVSMode(User *, int, const char **); void SendClientIntroduction(const char *, const char *, const char *, const char *, const char *); void SendBotOp(const char *, const char *); - void SendQuit(const char *, const char *); void SendPong(const char *, const char *); void SendJoin(const char *, const char *, time_t); void SendSQLineDel(const char *); |