Added cmd_quit() function to IRCDProtoNew class.

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1236 5417fbe8-f217-4b02-8779-1006273d7864

13 files changed, 23 insertions, 77 deletions

diff --git a/include/extern.h b/include/extern.h
index 374ac9918..3cdd9a518 100644
--- a/include/extern.h
+++ b/include/extern.h
@@ -611,7 +611,6 @@ E void pmodule_cmd_372_error(void (*func) (const char *source));
 E void pmodule_cmd_375(void (*func) (const char *source));
 E void pmodule_cmd_376(void (*func) (const char *source));
 E void pmodule_cmd_351(void (*func) (const char *source));
-E void pmodule_cmd_quit(void (*func) (const char *source, const char *buf));
 E void pmodule_cmd_pong(void (*func) (const char *servname, const char *who));
 E void pmodule_cmd_join(void (*func) (const char *user, const char *channel, time_t chantime));
 E void pmodule_cmd_unsqline(void (*func) (const char *user));
diff --git a/include/services.h b/include/services.h
index cc1ed7175..406a943a8 100644
--- a/include/services.h
+++ b/include/services.h
@@ -1061,7 +1061,6 @@ typedef struct ircd_proto_ {
     void (*ircd_cmd_375)(const char *source);
     void (*ircd_cmd_376)(const char *source);
     void (*ircd_cmd_351)(const char *source);
-    void (*ircd_cmd_quit)(const char *source, const char *buf);
     void (*ircd_cmd_pong)(const char *servname, const char *who);
     void (*ircd_cmd_join)(const char *user, const char *channel, time_t chantime);
     void (*ircd_cmd_unsqline)(const char *user);
@@ -1326,6 +1325,11 @@ class IRCDProtoNew {
 			send_cmd(source, "PRIVMSG %s%s :%s", ircd->globaltldprefix, dest, msg);
 		}
 		virtual void cmd_bot_chan_mode(const char *, const char *) = 0;
+		virtual void cmd_quit(const char *source, const char *buf)
+		{
+			if (buf) send_cmd(source, "QUIT :%s", buf);
+			else send_cmd(source, "QUIT");
+		}
 };
 
 /*************************************************************************/
diff --git a/src/ircd.c b/src/ircd.c
index a812164ea..206f24544 100644
--- a/src/ircd.c
+++ b/src/ircd.c
@@ -51,7 +51,6 @@ void initIrcdProto()
     ircdproto.ircd_cmd_375 = NULL;
     ircdproto.ircd_cmd_376 = NULL;
     ircdproto.ircd_cmd_351 = NULL;
-    ircdproto.ircd_cmd_quit = NULL;
     ircdproto.ircd_cmd_pong = NULL;
     ircdproto.ircd_cmd_join = NULL;
     ircdproto.ircd_cmd_unsqline = NULL;
@@ -295,15 +294,14 @@ void anope_cmd_351(const char *source)
 
 void anope_cmd_quit(const char *source, const char *fmt, ...)
 {
-    va_list args;
-    char buf[BUFSIZE];
-    *buf = '\0';
-    if (fmt) {
-        va_start(args, fmt);
-        vsnprintf(buf, BUFSIZE - 1, fmt, args);
-        va_end(args);
-    }
-    ircdproto.ircd_cmd_quit(source, buf);
+	va_list args;
+	char buf[BUFSIZE] = "";
+	if (fmt) {
+		va_start(args, fmt);
+		vsnprintf(buf, BUFSIZE - 1, fmt, args);
+		va_end(args);
+	}
+	ircdprotonew->cmd_quit(source, buf);
 }
 
 void anope_cmd_pong(const char *servname, const char *who)
@@ -663,11 +661,6 @@ void pmodule_cmd_351(void (*func) (const char *source))
     ircdproto.ircd_cmd_351 = func;
 }
 
-void pmodule_cmd_quit(void (*func) (const char *source, const char *buf))
-{
-    ircdproto.ircd_cmd_quit = func;
-}
-
 void pmodule_cmd_pong(void (*func) (const char *servname, const char *who))
 {
     ircdproto.ircd_cmd_pong = func;
diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c
index 35d1fb61d..1241e92a0 100644
--- a/src/protocol/bahamut.c
+++ b/src/protocol/bahamut.c
@@ -1206,16 +1206,6 @@ void bahamut_cmd_invite(const char *source, const char *chan, const char *nick)
     send_cmd(source, "INVITE %s %s", nick, chan);
 }
 
-/* QUIT */
-void bahamut_cmd_quit(const char *source, const char *buf)
-{
-    if (buf) {
-        send_cmd(source, "QUIT :%s", buf);
-    } else {
-        send_cmd(source, "QUIT");
-    }
-}
-
 int anope_event_away(const char *source, int ac, const char **av)
 {
     if (!source) {
@@ -1489,7 +1479,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_375(bahamut_cmd_375);
     pmodule_cmd_376(bahamut_cmd_376);
     pmodule_cmd_351(bahamut_cmd_351);
-    pmodule_cmd_quit(bahamut_cmd_quit);
     pmodule_cmd_pong(bahamut_cmd_pong);
     pmodule_cmd_join(bahamut_cmd_join);
     pmodule_cmd_unsqline(bahamut_cmd_unsqline);
diff --git a/src/protocol/bahamut.h b/src/protocol/bahamut.h
index d5cc2bb75..df40c4e3c 100644
--- a/src/protocol/bahamut.h
+++ b/src/protocol/bahamut.h
@@ -64,7 +64,6 @@ void bahamut_cmd_372_error(const char *source);
 void bahamut_cmd_375(const char *source);
 void bahamut_cmd_376(const char *source);
 void bahamut_cmd_351(const char *source);
-void bahamut_cmd_quit(const char *source, const char *buf);
 void bahamut_cmd_pong(const char *servname, const char *who);
 void bahamut_cmd_join(const char *user, const char *channel, time_t chantime);
 void bahamut_cmd_unsqline(const char *user);
diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c
index 4b04324e7..658c47bd1 100644
--- a/src/protocol/charybdis.c
+++ b/src/protocol/charybdis.c
@@ -1345,17 +1345,11 @@ void CharybdisProto::cmd_bot_chan_mode(const char *nick, const char *chan)
 }
 
 /* QUIT */
-void charybdis_cmd_quit(const char *source, const char *buf)
+void CharybdisProto::cmd_quit(const char *source, const char *buf)
 {
-    Uid *ud;
-    ud = find_uid(source);
-
-    if (buf) {
-        send_cmd((UseTS6 ? (ud ? ud->uid : source) : source), "QUIT :%s",
-                 buf);
-    } else {
-        send_cmd((UseTS6 ? (ud ? ud->uid : source) : source), "QUIT");
-    }
+	Uid *ud = find_uid(source);
+	if (buf) send_cmd(UseTS6 ? (ud ? ud->uid : source) : source, "QUIT :%s", buf);
+	else send_cmd(UseTS6 ? (ud ? ud->uid : source) : source, "QUIT");
 }
 
 /* PONG */
@@ -1738,7 +1732,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_375(charybdis_cmd_375);
     pmodule_cmd_376(charybdis_cmd_376);
     pmodule_cmd_351(charybdis_cmd_351);
-    pmodule_cmd_quit(charybdis_cmd_quit);
     pmodule_cmd_pong(charybdis_cmd_pong);
     pmodule_cmd_join(charybdis_cmd_join);
     pmodule_cmd_unsqline(charybdis_cmd_unsqline);
diff --git a/src/protocol/charybdis.h b/src/protocol/charybdis.h
index 643b8f0ff..ec67a247c 100644
--- a/src/protocol/charybdis.h
+++ b/src/protocol/charybdis.h
@@ -52,7 +52,6 @@ void charybdis_cmd_372_error(const char *source);
 void charybdis_cmd_375(const char *source);
 void charybdis_cmd_376(const char *source);
 void charybdis_cmd_351(const char *source);
-void charybdis_cmd_quit(const char *source, const char *buf);
 void charybdis_cmd_pong(const char *servname, const char *who);
 void charybdis_cmd_join(const char *user, const char *channel, time_t chantime);
 void charybdis_cmd_unsqline(const char *user);
@@ -113,4 +112,5 @@ class CharybdisProto : public IRCDProtoNew {
 		void cmd_notice(const char *, const char *, const char *);
 		void cmd_privmsg(const char *, const char *, const char *);
 		void cmd_bot_chan_mode(const char *, const char *);
+		void cmd_quit(const char *, const char *);
 } ircd_proto;
diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c
index c8b691e2e..78b2a4649 100644
--- a/src/protocol/inspircd11.c
+++ b/src/protocol/inspircd11.c
@@ -792,16 +792,6 @@ void inspircd_cmd_351(const char *source)
              EncModule, version_build);
 }
 
-/* QUIT */
-void inspircd_cmd_quit(const char *source, const char *buf)
-{
-    if (buf) {
-        send_cmd(source, "QUIT :%s", buf);
-    } else {
-        send_cmd(source, "QUIT :Exiting");
-    }
-}
-
 /* PROTOCTL */
 void inspircd_cmd_protoctl()
 {
@@ -1735,7 +1725,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_375(inspircd_cmd_375);
     pmodule_cmd_376(inspircd_cmd_376);
     pmodule_cmd_351(inspircd_cmd_351);
-    pmodule_cmd_quit(inspircd_cmd_quit);
     pmodule_cmd_pong(inspircd_cmd_pong);
     pmodule_cmd_join(inspircd_cmd_join);
     pmodule_cmd_unsqline(inspircd_cmd_unsqline);
diff --git a/src/protocol/inspircd11.h b/src/protocol/inspircd11.h
index 59551d6f1..6ba7ad1c0 100755
--- a/src/protocol/inspircd11.h
+++ b/src/protocol/inspircd11.h
@@ -57,7 +57,6 @@ void inspircd_cmd_372_error(const char *source);
 void inspircd_cmd_375(const char *source);
 void inspircd_cmd_376(const char *source);
 void inspircd_cmd_351(const char *source);
-void inspircd_cmd_quit(const char *source, const char *buf);
 void inspircd_cmd_pong(const char *servname, const char *who);
 void inspircd_cmd_join(const char *user, const char *channel, time_t chantime);
 void inspircd_cmd_unsqline(const char *user);
diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c
index a8cdc7629..ad882e924 100644
--- a/src/protocol/ratbox.c
+++ b/src/protocol/ratbox.c
@@ -1277,17 +1277,11 @@ void RatboxProto::cmd_bot_chan_mode(const char *nick, const char *chan)
 }
 
 /* QUIT */
-void ratbox_cmd_quit(const char *source, const char *buf)
+void RatboxProto::cmd_quit(const char *source, const char *buf)
 {
-    Uid *ud;
-    ud = find_uid(source);
-
-    if (buf) {
-        send_cmd((UseTS6 ? (ud ? ud->uid : source) : source), "QUIT :%s",
-                 buf);
-    } else {
-        send_cmd((UseTS6 ? (ud ? ud->uid : source) : source), "QUIT");
-    }
+	Uid *ud = find_uid(source);
+	if (buf) send_cmd(UseTS6 ? (ud ? ud->uid : source) : source, "QUIT :%s", buf);
+	else send_cmd(UseTS6 ? (ud ? ud->uid : source) : source, "QUIT");
 }
 
 /* PONG */
@@ -1632,7 +1626,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_375(ratbox_cmd_375);
     pmodule_cmd_376(ratbox_cmd_376);
     pmodule_cmd_351(ratbox_cmd_351);
-    pmodule_cmd_quit(ratbox_cmd_quit);
     pmodule_cmd_pong(ratbox_cmd_pong);
     pmodule_cmd_join(ratbox_cmd_join);
     pmodule_cmd_unsqline(ratbox_cmd_unsqline);
diff --git a/src/protocol/ratbox.h b/src/protocol/ratbox.h
index 98530eb6f..1beeafceb 100644
--- a/src/protocol/ratbox.h
+++ b/src/protocol/ratbox.h
@@ -51,7 +51,6 @@ void ratbox_cmd_372_error(const char *source);
 void ratbox_cmd_375(const char *source);
 void ratbox_cmd_376(const char *source);
 void ratbox_cmd_351(const char *source);
-void ratbox_cmd_quit(const char *source, const char *buf);
 void ratbox_cmd_pong(const char *servname, const char *who);
 void ratbox_cmd_join(const char *user, const char *channel, time_t chantime);
 void ratbox_cmd_unsqline(const char *user);
@@ -111,4 +110,5 @@ class RatboxProto : public IRCDProtoNew {
 		void cmd_notice(const char *, const char *, const char *);
 		void cmd_privmsg(const char *, const char *, const char *);
 		void cmd_bot_chan_mode(const char *, const char *);
+		void cmd_quit(const char *, const char *);
 } ircd_proto;
diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c
index da5142fdf..8684be95c 100644
--- a/src/protocol/unreal32.c
+++ b/src/protocol/unreal32.c
@@ -642,16 +642,6 @@ void unreal_cmd_351(const char *source)
              version_flags, EncModule, version_build);
 }
 
-/* QUIT */
-void unreal_cmd_quit(const char *source, const char *buf)
-{
-    if (buf) {
-        send_cmd(source, "%s :%s", send_token("QUIT", ","), buf);
-    } else {
-        send_cmd(source, "%s", send_token("QUIT", ","));
-    }
-}
-
 /* PROTOCTL */
 /*
    NICKv2 = Nick Version 2
@@ -2036,7 +2026,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_375(unreal_cmd_375);
     pmodule_cmd_376(unreal_cmd_376);
     pmodule_cmd_351(unreal_cmd_351);
-    pmodule_cmd_quit(unreal_cmd_quit);
     pmodule_cmd_pong(unreal_cmd_pong);
     pmodule_cmd_join(unreal_cmd_join);
     pmodule_cmd_unsqline(unreal_cmd_unsqline);
diff --git a/src/protocol/unreal32.h b/src/protocol/unreal32.h
index 1b5e168d3..d4d99541b 100644
--- a/src/protocol/unreal32.h
+++ b/src/protocol/unreal32.h
@@ -86,7 +86,6 @@ void unreal_cmd_372_error(const char *source);
 void unreal_cmd_375(const char *source);
 void unreal_cmd_376(const char *source);
 void unreal_cmd_351(const char *source);
-void unreal_cmd_quit(const char *source, const char *buf);
 void unreal_cmd_pong(const char *servname, const char *who);
 void unreal_cmd_join(const char *user, const char *channel, time_t chantime);
 void unreal_cmd_unsqline(const char *user);