From 70501666e8a31d2e959639fd0dba0e06d5005080 Mon Sep 17 00:00:00 2001 From: "Naram Qashat cyberbotx@cyberbotx.com" Date: Thu, 2 Oct 2008 18:04:29 +0000 Subject: Replaced anope_SendSVSKill() with direct call to SendSVSKill() in IRCDProto class. Also added SendSVSKillInternal() function to IRCDProto class, now SendSVSKill() is a stub to handle varargs. git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1326 5417fbe8-f217-4b02-8779-1006273d7864 --- src/protocol/bahamut.c | 2 +- src/protocol/bahamut.h | 2 +- src/protocol/charybdis.c | 2 +- src/protocol/charybdis.h | 2 +- src/protocol/inspircd11.c | 2 +- src/protocol/inspircd11.h | 2 +- src/protocol/ratbox.c | 2 +- src/protocol/ratbox.h | 2 +- src/protocol/unreal32.c | 2 +- src/protocol/unreal32.h | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) (limited to 'src/protocol') diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c index 9cd553754..53613d37d 100644 --- a/src/protocol/bahamut.c +++ b/src/protocol/bahamut.c @@ -693,7 +693,7 @@ void BahamutIRCdProto::SendAkill(const char *user, const char *host, const char /* Note: if the stamp is null 0, the below usage is correct of Bahamut */ -void BahamutIRCdProto::SendSVSKill(const char *source, const char *user, const char *buf) +void BahamutIRCdProto::SendSVSKillInternal(const char *source, const char *user, const char *buf) { if (!source || !user || !buf) return; send_cmd(source, "SVSKILL %s :%s", user, buf); diff --git a/src/protocol/bahamut.h b/src/protocol/bahamut.h index df8166c7b..273a8d759 100644 --- a/src/protocol/bahamut.h +++ b/src/protocol/bahamut.h @@ -59,12 +59,12 @@ #define DEFAULT_MLOCK CMODE_n | CMODE_t | CMODE_r class BahamutIRCdProto : public IRCDProto { + void SendSVSKillInternal(const char *, const char *, const char *); public: void SendSVSNOOP(const char *, int); void SendAkillDel(const char *, const char *); void SendTopic(BotInfo *, const char *, const char *, const char *, time_t); void SendAkill(const char *, const char *, const char *, time_t, time_t, const char *); - void SendSVSKill(const char *, const char *, const char *); void SendSVSMode(User *, int, const char **); void SendGuestNick(const char *, const char *, const char *, const char *, const char *); void SendMode(const char *, const char *, const char *); diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c index 6afb2cd07..beff0a919 100644 --- a/src/protocol/charybdis.c +++ b/src/protocol/charybdis.c @@ -715,7 +715,7 @@ void CharybdisProto::SendAkill(const char *user, const char *host, const char *w send_cmd(UseTS6 ? (bi ? bi->uid.c_str() : s_OperServ) : s_OperServ, "KLINE * %ld %s %s :%s", static_cast(expires - time(NULL)), user, host, reason); } -void CharybdisProto::SendSVSKill(const char *source, const char *user, const char *buf) +void CharybdisProto::SendSVSKillInternal(const char *source, const char *user, const char *buf) { if (!source || !user || !buf) return; BotInfo *bi = findbot(source); diff --git a/src/protocol/charybdis.h b/src/protocol/charybdis.h index 3d6cd3f90..116bb5d42 100644 --- a/src/protocol/charybdis.h +++ b/src/protocol/charybdis.h @@ -47,11 +47,11 @@ class CharybdisProto : public IRCDTS6Proto { + void SendSVSKillInternal(const char *, const char *, const char *); public: void SendAkillDel(const char *, const char *); void SendVhostDel(User *); void SendAkill(const char *, const char *, const char *, time_t, time_t, const char *); - void SendSVSKill(const char *, const char *, const char *); void SendSVSMode(User *, int, const char **); void SendMode(const char *, const char *, const char *); void SendClientIntroduction(const char *, const char *, const char *, const char *, const char *); diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c index 41f5023a7..f968ff83c 100644 --- a/src/protocol/inspircd11.c +++ b/src/protocol/inspircd11.c @@ -541,7 +541,7 @@ void InspIRCdProto::SendAkill(const char *user, const char *host, const char *wh send_cmd(ServerName, "ADDLINE G %s@%s %s %ld %ld :%s", user, host, who, static_cast(when), static_cast(timeleft), reason); } -void InspIRCdProto::SendSVSKill(const char *source, const char *user, const char *buf) +void InspIRCdProto::SendSVSKillInternal(const char *source, const char *user, const char *buf) { if (!buf || !source || !user) return; send_cmd(source, "KILL %s :%s", user, buf); diff --git a/src/protocol/inspircd11.h b/src/protocol/inspircd11.h index 0097d142b..96f3d1d44 100755 --- a/src/protocol/inspircd11.h +++ b/src/protocol/inspircd11.h @@ -52,12 +52,12 @@ #define DEFAULT_MLOCK CMODE_n | CMODE_t | CMODE_r class InspIRCdProto : public IRCDProto { + void SendSVSKillInternal(const char *, const char *, const char *); public: void SendAkillDel(const char *, const char *); void SendTopic(BotInfo *, const char *, const char *, const char *, time_t); void SendVhostDel(User *); void SendAkill(const char *, const char *, const char *, time_t, time_t, const char *); - void SendSVSKill(const char *, const char *, const char *); void SendSVSMode(User *, int, const char **); void SendGuestNick(const char *, const char *, const char *, const char *, const char *); void SendMode(const char *, const char *, const char *); diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c index d78027487..7e2e97878 100644 --- a/src/protocol/ratbox.c +++ b/src/protocol/ratbox.c @@ -654,7 +654,7 @@ void RatboxProto::SendAkill(const char *user, const char *host, const char *who, send_cmd(UseTS6 ? (ud ? ud->uid : s_OperServ) : s_OperServ, "KLINE * %ld %s %s :%s", static_cast(expires - time(NULL)), user, host, reason); } -void RatboxProto::SendSVSKill(const char *source, const char *user, const char *buf) +void RatboxProto::SendSVSKillInternal(const char *source, const char *user, const char *buf) { if (!source || !user || !buf) return; Uid *ud = find_uid(source), *ud2 = find_uid(user); diff --git a/src/protocol/ratbox.h b/src/protocol/ratbox.h index b73485279..7eef7ab14 100644 --- a/src/protocol/ratbox.h +++ b/src/protocol/ratbox.h @@ -46,10 +46,10 @@ class RatboxProto : public IRCDTS6Proto { + void SendSVSKillInternal(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 *); - void SendSVSKill(const char *, const char *, const char *); void SendSVSMode(User *, int, const char **); void SendMode(const char *, const char *, const char *); void SendClientIntroduction(const char *, const char *, const char *, const char *, const char *); diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c index 0d9789862..05aaeeafa 100644 --- a/src/protocol/unreal32.c +++ b/src/protocol/unreal32.c @@ -514,7 +514,7 @@ void UnrealIRCdProto::SendAkill(const char *user, const char *host, const char * ** parv[1] = client ** parv[2] = kill message */ -void UnrealIRCdProto::SendSVSKill(const char *source, const char *user, const char *buf) +void UnrealIRCdProto::SendSVSKillInternal(const char *source, const char *user, const char *buf) { if (!source || !user || !buf) return; send_cmd(source, "%s %s :%s", send_token("SVSKILL", "h"), user, buf); diff --git a/src/protocol/unreal32.h b/src/protocol/unreal32.h index b25a810e6..8f14783c5 100644 --- a/src/protocol/unreal32.h +++ b/src/protocol/unreal32.h @@ -81,13 +81,13 @@ #define DEFAULT_MLOCK CMODE_n | CMODE_t | CMODE_r class UnrealIRCdProto : public IRCDProto { + void SendSVSKillInternal(const char *, const char *, const char *); public: void SendSVSNOOP(const char *, int); void SendAkillDel(const char *, const char *); void SendTopic(BotInfo *, const char *, const char *, const char *, time_t); void SendVhostDel(User *); void SendAkill(const char *, const char *, const char *, time_t, time_t, const char *); - void SendSVSKill(const char *, const char *, const char *); void SendSVSMode(User *, int, const char **); void SendGuestNick(const char *, const char *, const char *, const char *, const char *); void SendMode(const char *, const char *, const char *); -- cgit