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 --- include/extern.h | 1 - include/services.h | 13 ++++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/extern.h b/include/extern.h index 1cff3a732..2c67ed542 100644 --- a/include/extern.h +++ b/include/extern.h @@ -1155,7 +1155,6 @@ E void anope_SendSVSHOLD(const char *nick); /* SVSHOLD */ E void anope_SendSVSHOLDDel(const char *nick); /* SVSHOLD */ E void anope_cmd_svsinfo(); /* SVSINFO */ E void anope_SendSVSJoin(const char *source, const char *nick,const char *chan, const char *param); /* SVSJOIN */ -E void anope_SendSVSKill(const char *source, const char *user, const char *fmt, ...); /* SVSKILL */ E void anope_SendSVSMode(User * u, int ac, const char **av); /* SVSMODE */ E void anope_SendSVSMode_chan(const char *name, const char *mode, const char *nick); /* SVSMODE */ E void anope_SendForceNickChange(const char *nick,const char *newnick, time_t when); /* SVSNICK */ diff --git a/include/services.h b/include/services.h index 6abfcf6dc..ffaebd578 100644 --- a/include/services.h +++ b/include/services.h @@ -1230,13 +1230,24 @@ class IRCDProto; #include "extern.h" class IRCDProto { + virtual void SendSVSKillInternal(const char *, const char *, const char *) = 0; public: virtual void SendSVSNOOP(const char *, int) { } virtual void SendAkillDel(const char *, const char *) = 0; virtual void SendTopic(BotInfo *, const char *, const char *, const char *, time_t) = 0; virtual void SendVhostDel(User *) { } virtual void SendAkill(const char *, const char *, const char *, time_t, time_t, const char *) = 0; - virtual void SendSVSKill(const char *, const char *, const char *) = 0; + virtual void SendSVSKill(const char *source, const char *user, const char *fmt, ...) + { + va_list args; + char buf[BUFSIZE] = ""; + if (fmt) { + va_start(args, fmt); + vsnprintf(buf, BUFSIZE - 1, fmt, args); + va_end(args); + } + SendSVSKillInternal(source, user, buf); + } virtual void SendSVSMode(User *, int, const char **) = 0; virtual void SendGuestNick(const char *, const char *, const char *, const char *, const char *) { } virtual void SendMode(const char *, const char *, const char *) = 0; -- cgit