Added cmd_svskill() function to IRCDProtoNew class.

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

11 files changed, 23 insertions, 57 deletions

diff --git a/include/services.h b/include/services.h
index 7c106a8a2..046eff711 100644
--- a/include/services.h
+++ b/include/services.h
@@ -1151,6 +1151,7 @@ class IRCDProtoNew {
 		virtual void cmd_topic(const char *whosets, const char *chan, const char *whosetit, const char *topic, time_t when) = 0;
 		virtual void cmd_vhost_off(User *) { }
 		virtual void cmd_akill(const char *, const char *, const char *, time_t, time_t, const char *) = 0;
+		virtual void cmd_svskill(const char *source, const char *user, const char *buf) = 0;
 };
 
 typedef struct ircd_modes_ {
diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c
index e30e5101d..5987cd9f0 100644
--- a/src/protocol/bahamut.c
+++ b/src/protocol/bahamut.c
@@ -815,14 +815,10 @@ void BahamutIRCdProto::cmd_akill(const char *user, const char *host, const char
 /*
   Note: if the stamp is null 0, the below usage is correct of Bahamut
 */
-void bahamut_cmd_svskill(const char *source, const char *user, const char *buf)
+void BahamutIRCdProto::cmd_svskill(const char *source, const char *user, const char *buf)
 {
-
-    if (!source || !user || !buf) {
-        return;
-    }
-
-    send_cmd(source, "SVSKILL %s :%s", user, buf);
+	if (!source || !user || !buf) return;
+	send_cmd(source, "SVSKILL %s :%s", user, buf);
 }
 
 /* SVSMODE */
@@ -1548,7 +1544,6 @@ void bahamut_cmd_chghost(const char *nick, const char *vhost)
  **/
 void moduleAddAnopeCmds()
 {
-    pmodule_cmd_svskill(bahamut_cmd_svskill);
     pmodule_cmd_svsmode(bahamut_cmd_svsmode);
     pmodule_cmd_372(bahamut_cmd_372);
     pmodule_cmd_372_error(bahamut_cmd_372_error);
diff --git a/src/protocol/bahamut.h b/src/protocol/bahamut.h
index 7b6dc1364..1db0b577f 100644
--- a/src/protocol/bahamut.h
+++ b/src/protocol/bahamut.h
@@ -59,7 +59,6 @@
 #define DEFAULT_MLOCK CMODE_n | CMODE_t | CMODE_r
 
 void bahamut_set_umode(User * user, int ac, const char **av);
-void bahamut_cmd_svskill(const char *source, const char *user, const char *buf);
 void bahamut_cmd_svsmode(User * u, int ac, const char **av);
 void bahamut_cmd_372(const char *source, const char *msg);
 void bahamut_cmd_372_error(const char *source);
@@ -128,4 +127,5 @@ class BahamutIRCdProto : public IRCDProtoNew {
 		void cmd_remove_akill(const char *, const char *);
 		void cmd_topic(const char *, const char *, const char *, const char *, time_t);
 		void cmd_akill(const char *, const char *, const char *, time_t, time_t, const char *);
+		void cmd_svskill(const char *source, const char *user, const char *buf);
 } ircd_proto;
diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c
index 6f70101cb..0fb878226 100644
--- a/src/protocol/charybdis.c
+++ b/src/protocol/charybdis.c
@@ -883,22 +883,11 @@ void CharybdisProto::cmd_akill(const char *user, const char *host, const char *w
 	send_cmd(UseTS6 ? (ud ? ud->uid : s_OperServ) : s_OperServ, "KLINE * %ld %s %s :%s", static_cast<long>(expires - time(NULL)), user, host, reason);
 }
 
-void charybdis_cmd_svskill(const char *source, const char *user, const char *buf)
+void CharybdisProto::cmd_svskill(const char *source, const char *user, const char *buf)
 {
-    Uid *ud, *ud2;
-
-    if (!buf) {
-        return;
-    }
-
-    if (!source || !user) {
-        return;
-    }
-
-    ud = find_uid(source);
-    ud2 = find_uid(user);
-    send_cmd((UseTS6 ? (ud ? ud->uid : source) : source), "KILL %s :%s",
-             (UseTS6 ? (ud2 ? ud2->uid : user) : user), buf);
+	if (!source || !user || !buf) return;
+	Uid *ud = find_uid(source), *ud2 = find_uid(user);
+	send_cmd(UseTS6 ? (ud ? ud->uid : source) : source, "KILL %s :%s", UseTS6 ? (ud2 ? ud2->uid : user) : user, buf);
 }
 
 void charybdis_cmd_svsmode(User * u, int ac, const char **av)
@@ -1821,7 +1810,6 @@ int charybdis_send_deaccount(int argc, char **argv)
  **/
 void moduleAddAnopeCmds()
 {
-    pmodule_cmd_svskill(charybdis_cmd_svskill);
     pmodule_cmd_svsmode(charybdis_cmd_svsmode);
     pmodule_cmd_372(charybdis_cmd_372);
     pmodule_cmd_372_error(charybdis_cmd_372_error);
diff --git a/src/protocol/charybdis.h b/src/protocol/charybdis.h
index 8920ede40..6b65d3e1d 100644
--- a/src/protocol/charybdis.h
+++ b/src/protocol/charybdis.h
@@ -47,7 +47,6 @@
 
 
 void charybdis_set_umode(User * user, int ac, const char **av);
-void charybdis_cmd_svskill(const char *source, const char *user, const char *buf);
 void charybdis_cmd_svsmode(User * u, int ac, const char **av);
 void charybdis_cmd_372(const char *source, const char *msg);
 void charybdis_cmd_372_error(const char *source);
@@ -116,4 +115,5 @@ class CharybdisProto : public IRCDProtoNew {
 		void cmd_topic(const char *, const char *, const char *, const char *, time_t);
 		void cmd_vhost_off(User *);
 		void cmd_akill(const char *, const char *, const char *, time_t, time_t, const char *);
+		void cmd_svskill(const char *source, const char *user, const char *buf);
 } ircd_proto;
diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c
index a3569b2e4..b21d8f365 100644
--- a/src/protocol/inspircd11.c
+++ b/src/protocol/inspircd11.c
@@ -565,12 +565,10 @@ void InspIRCdProto::cmd_akill(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<long>(when), static_cast<long>(timeleft), reason);
 }
 
-void inspircd_cmd_svskill(const char *source, const char *user, const char *buf)
+void InspIRCdProto::cmd_svskill(const char *source, const char *user, const char *buf)
 {
-    if (!buf || !source || !user)
-        return;
-
-    send_cmd(source, "KILL %s :%s", user, buf);
+	if (!buf || !source || !user) return;
+	send_cmd(source, "KILL %s :%s", user, buf);
 }
 
 void inspircd_cmd_svsmode(User * u, int ac, const char **av)
@@ -1789,7 +1787,6 @@ void inspircd_cmd_ctcp(const char *source, const char *dest, const char *buf)
  **/
 void moduleAddAnopeCmds()
 {
-    pmodule_cmd_svskill(inspircd_cmd_svskill);
     pmodule_cmd_svsmode(inspircd_cmd_svsmode);
     pmodule_cmd_372(inspircd_cmd_372);
     pmodule_cmd_372_error(inspircd_cmd_372_error);
diff --git a/src/protocol/inspircd11.h b/src/protocol/inspircd11.h
index cc3069a9d..a0ab419e6 100755
--- a/src/protocol/inspircd11.h
+++ b/src/protocol/inspircd11.h
@@ -52,7 +52,6 @@
 #define DEFAULT_MLOCK CMODE_n | CMODE_t | CMODE_r
 
 void inspircd_set_umode(User * user, int ac, const char **av);
-void inspircd_cmd_svskill(const char *source, const char *user, const char *buf);
 void inspircd_cmd_svsmode(User * u, int ac, const char **av);
 void inspircd_cmd_372(const char *source, const char *msg);
 void inspircd_cmd_372_error(const char *source);
@@ -132,4 +131,5 @@ class InspIRCdProto : public IRCDProtoNew {
 		void cmd_topic(const char *, const char *, const char *, const char *, time_t);
 		void cmd_vhost_off(User *);
 		void cmd_akill(const char *, const char *, const char *, time_t, time_t, const char *);
+		void cmd_svskill(const char *source, const char *user, const char *buf);
 } ircd_proto;
diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c
index a7b67971c..e0b3ebfc9 100644
--- a/src/protocol/ratbox.c
+++ b/src/protocol/ratbox.c
@@ -825,22 +825,11 @@ void RatboxProto::cmd_akill(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<long>(expires - time(NULL)), user, host, reason);
 }
 
-void ratbox_cmd_svskill(const char *source, const char *user, const char *buf)
+void RatboxProto::cmd_svskill(const char *source, const char *user, const char *buf)
 {
-    Uid *ud, *ud2;
-
-    if (!buf) {
-        return;
-    }
-
-    if (!source || !user) {
-        return;
-    }
-
-    ud = find_uid(source);
-    ud2 = find_uid(user);
-    send_cmd((UseTS6 ? (ud ? ud->uid : source) : source), "KILL %s :%s",
-             (UseTS6 ? (ud2 ? ud2->uid : user) : user), buf);
+	if (!source || !user || !buf) return;
+	Uid *ud = find_uid(source), *ud2 = find_uid(user);
+	send_cmd(UseTS6 ? (ud ? ud->uid : source) : source, "KILL %s :%s", UseTS6 ? (ud2 ? ud2->uid : user) : user, buf);
 }
 
 void ratbox_cmd_svsmode(User * u, int ac, const char **av)
@@ -1713,7 +1702,6 @@ void ratbox_cmd_ctcp(const char *source, const char *dest, const char *buf)
  **/
 void moduleAddAnopeCmds()
 {
-    pmodule_cmd_svskill(ratbox_cmd_svskill);
     pmodule_cmd_svsmode(ratbox_cmd_svsmode);
     pmodule_cmd_372(ratbox_cmd_372);
     pmodule_cmd_372_error(ratbox_cmd_372_error);
diff --git a/src/protocol/ratbox.h b/src/protocol/ratbox.h
index e7f6a3933..68be52606 100644
--- a/src/protocol/ratbox.h
+++ b/src/protocol/ratbox.h
@@ -46,7 +46,6 @@
 
 
 void ratbox_set_umode(User * user, int ac, const char **av);
-void ratbox_cmd_svskill(const char *source, const char *user, const char *buf);
 void ratbox_cmd_svsmode(User * u, int ac, const char **av);
 void ratbox_cmd_372(const char *source, const char *msg);
 void ratbox_cmd_372_error(const char *source);
@@ -114,4 +113,5 @@ class RatboxProto : public IRCDProtoNew {
 		void cmd_remove_akill(const char *, const char *);
 		void cmd_topic(const char *, const char *, const char *, const char *, time_t);
 		void cmd_akill(const char *, const char *, const char *, time_t, time_t, const char *);
+		void cmd_svskill(const char *source, const char *user, const char *buf);
 } ircd_proto;
diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c
index 5dbee9468..9d64c423d 100644
--- a/src/protocol/unreal32.c
+++ b/src/protocol/unreal32.c
@@ -543,12 +543,10 @@ void UnrealIRCdProto::cmd_akill(const char *user, const char *host, const char *
 **	parv[1] = client
 **	parv[2] = kill message
 */
-void unreal_cmd_svskill(const char *source, const char *user, const char *buf)
+void UnrealIRCdProto::cmd_svskill(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);
+	if (!source || !user || !buf) return;
+	send_cmd(source, "%s %s :%s", send_token("SVSKILL", "h"), user, buf);
 }
 
 /*
@@ -2098,7 +2096,6 @@ void moduleAddIRCDMsgs(void) {
  **/
 void moduleAddAnopeCmds()
 {
-    pmodule_cmd_svskill(unreal_cmd_svskill);
     pmodule_cmd_svsmode(unreal_cmd_svsmode);
     pmodule_cmd_372(unreal_cmd_372);
     pmodule_cmd_372_error(unreal_cmd_372_error);
diff --git a/src/protocol/unreal32.h b/src/protocol/unreal32.h
index d90c51f71..69b659d73 100644
--- a/src/protocol/unreal32.h
+++ b/src/protocol/unreal32.h
@@ -81,7 +81,6 @@
 #define DEFAULT_MLOCK CMODE_n | CMODE_t | CMODE_r
 
 void unreal_set_umode(User * user, int ac, const char **av);
-void unreal_cmd_svskill(const char *source, const char *user, const char *buf);
 void unreal_cmd_svsmode(User * u, int ac, const char **av);
 void unreal_cmd_372(const char *source, const char *msg);
 void unreal_cmd_372_error(const char *source);
@@ -151,4 +150,5 @@ class UnrealIRCdProto : public IRCDProtoNew {
 		void cmd_topic(const char *, const char *, const char *, const char *, time_t);
 		void cmd_vhost_off(User *);
 		void cmd_akill(const char *, const char *, const char *, time_t, time_t, const char *);
+		void cmd_svskill(const char *source, const char *user, const char *buf);
 } ircd_proto;