Added cmd_unsgline() function to IRCDProtoNew class.

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

11 files changed, 15 insertions, 39 deletions

diff --git a/src/ircd.c b/src/ircd.c
index bf3889027..a4edd0b18 100644
--- a/src/ircd.c
+++ b/src/ircd.c
@@ -63,7 +63,6 @@ void initIrcdProto()
     ircdproto.ircd_cmd_242 = NULL;
     ircdproto.ircd_cmd_243 = NULL;
     ircdproto.ircd_cmd_211 = NULL;
-    ircdproto.ircd_cmd_unsgline = NULL;
     ircdproto.ircd_cmd_unszline = NULL;
     ircdproto.ircd_cmd_szline = NULL;
     ircdproto.ircd_cmd_sgline = NULL;
@@ -505,7 +504,7 @@ void anope_cmd_release_svshold(const char *nick)
 
 void anope_cmd_unsgline(const char *mask)
 {
-    ircdproto.ircd_cmd_unsgline(mask);
+	ircdprotonew->cmd_unsgline(mask);
 }
 
 void anope_cmd_unszline(const char *mask)
@@ -703,11 +702,6 @@ void pmodule_cmd_211(void (*func) (const char *buf))
     ircdproto.ircd_cmd_211 = func;
 }
 
-void pmodule_cmd_unsgline(void (*func) (const char *mask))
-{
-    ircdproto.ircd_cmd_unsgline = func;
-}
-
 void pmodule_cmd_unszline(void (*func) (const char *mask))
 {
     ircdproto.ircd_cmd_unszline = func;
diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c
index 7a924fb1a..d5cd4c0b8 100644
--- a/src/protocol/bahamut.c
+++ b/src/protocol/bahamut.c
@@ -693,9 +693,9 @@ void BahamutIRCdProto::cmd_sqline(const char *mask, const char *reason)
 }
 
 /* UNSGLINE */
-void bahamut_cmd_unsgline(const char *mask)
+void BahamutIRCdProto::cmd_unsgline(const char *mask)
 {
-    send_cmd(NULL, "UNSGLINE 0 :%s", mask);
+	send_cmd(NULL, "UNSGLINE 0 :%s", mask);
 }
 
 /* UNSZLINE */
@@ -1396,7 +1396,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_242(bahamut_cmd_242);
     pmodule_cmd_243(bahamut_cmd_243);
     pmodule_cmd_211(bahamut_cmd_211);
-    pmodule_cmd_unsgline(bahamut_cmd_unsgline);
     pmodule_cmd_unszline(bahamut_cmd_unszline);
     pmodule_cmd_szline(bahamut_cmd_szline);
     pmodule_cmd_sgline(bahamut_cmd_sgline);
diff --git a/src/protocol/bahamut.h b/src/protocol/bahamut.h
index a586b9ec5..595aefcd1 100644
--- a/src/protocol/bahamut.h
+++ b/src/protocol/bahamut.h
@@ -76,7 +76,6 @@ void bahamut_cmd_318(const char *source, const char *who);
 void bahamut_cmd_242(const char *buf);
 void bahamut_cmd_243(const char *buf);
 void bahamut_cmd_211(const char *buf);
-void bahamut_cmd_unsgline(const char *mask);
 void bahamut_cmd_unszline(const char *mask);
 void bahamut_cmd_szline(const char *mask, const char *reason, const char *whom);
 void bahamut_cmd_sgline(const char *mask, const char *reason);
@@ -113,4 +112,5 @@ class BahamutIRCdProto : public IRCDProtoNew {
 		void cmd_connect();
 		void cmd_svshold(const char *);
 		void cmd_release_svshold(const char *);
+		void cmd_unsgline(const char *);
 } ircd_proto;
diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c
index 96b39bb46..3ded27fbb 100644
--- a/src/protocol/charybdis.c
+++ b/src/protocol/charybdis.c
@@ -752,13 +752,10 @@ void CharybdisProto::cmd_sqline(const char *mask, const char *reason)
 	send_cmd(UseTS6 ? (ud ? ud->uid : s_OperServ) : s_OperServ, "RESV * %s :%s", mask, reason);
 }
 
-void charybdis_cmd_unsgline(const char *mask)
+void CharybdisProto::cmd_unsgline(const char *mask)
 {
-    Uid *ud;
-
-    ud = find_uid(s_OperServ);
-    send_cmd((UseTS6 ? (ud ? ud->uid : s_OperServ) : s_OperServ),
-             "UNXLINE * %s", mask);
+	Uid *ud = find_uid(s_OperServ);
+	send_cmd(UseTS6 ? (ud ? ud->uid : s_OperServ) : s_OperServ, "UNXLINE * %s", mask);
 }
 
 void charybdis_cmd_unszline(const char *mask)
@@ -1670,7 +1667,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_242(charybdis_cmd_242);
     pmodule_cmd_243(charybdis_cmd_243);
     pmodule_cmd_211(charybdis_cmd_211);
-    pmodule_cmd_unsgline(charybdis_cmd_unsgline);
     pmodule_cmd_unszline(charybdis_cmd_unszline);
     pmodule_cmd_szline(charybdis_cmd_szline);
     pmodule_cmd_sgline(charybdis_cmd_sgline);
diff --git a/src/protocol/charybdis.h b/src/protocol/charybdis.h
index c94317f8c..3574713e1 100644
--- a/src/protocol/charybdis.h
+++ b/src/protocol/charybdis.h
@@ -64,7 +64,6 @@ void charybdis_cmd_318(const char *source, const char *who);
 void charybdis_cmd_242(const char *buf);
 void charybdis_cmd_243(const char *buf);
 void charybdis_cmd_211(const char *buf);
-void charybdis_cmd_unsgline(const char *mask);
 void charybdis_cmd_unszline(const char *mask);
 void charybdis_cmd_szline(const char *mask, const char *reason, const char *whom);
 void charybdis_cmd_sgline(const char *mask, const char *reason);
@@ -110,4 +109,5 @@ class CharybdisProto : public IRCDProtoNew {
 		void cmd_connect();
 		void cmd_svshold(const char *);
 		void cmd_release_svshold(const char *);
+		void cmd_unsgline(const char *);
 } ircd_proto;
diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c
index b11bcd557..2dcb99588 100644
--- a/src/protocol/inspircd11.c
+++ b/src/protocol/inspircd11.c
@@ -1467,12 +1467,6 @@ void InspIRCdProto::cmd_release_svshold(const char *nick)
 	send_cmd(s_OperServ, "SVSHOLD %s", nick);
 }
 
-/* UNSGLINE */
-void inspircd_cmd_unsgline(const char *mask)
-{
-    /* Not Supported by this IRCD */
-}
-
 /* UNSZLINE */
 void inspircd_cmd_unszline(const char *mask)
 {
@@ -1647,7 +1641,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_242(inspircd_cmd_242);
     pmodule_cmd_243(inspircd_cmd_243);
     pmodule_cmd_211(inspircd_cmd_211);
-    pmodule_cmd_unsgline(inspircd_cmd_unsgline);
     pmodule_cmd_unszline(inspircd_cmd_unszline);
     pmodule_cmd_szline(inspircd_cmd_szline);
     pmodule_cmd_sgline(inspircd_cmd_sgline);
diff --git a/src/protocol/inspircd11.h b/src/protocol/inspircd11.h
index 9f2bc9491..b4e21c3a8 100755
--- a/src/protocol/inspircd11.h
+++ b/src/protocol/inspircd11.h
@@ -69,7 +69,6 @@ void inspircd_cmd_318(const char *source, const char *who);
 void inspircd_cmd_242(const char *buf);
 void inspircd_cmd_243(const char *buf);
 void inspircd_cmd_211(const char *buf);
-void inspircd_cmd_unsgline(const char *mask);
 void inspircd_cmd_unszline(const char *mask);
 void inspircd_cmd_szline(const char *mask, const char *reason, const char *whom);
 void inspircd_cmd_sgline(const char *mask, const char *reason);
diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c
index f2d3eab73..e048c583f 100644
--- a/src/protocol/ratbox.c
+++ b/src/protocol/ratbox.c
@@ -699,13 +699,10 @@ void RatboxProto::cmd_sqline(const char *mask, const char *reason)
 	send_cmd(UseTS6 ? (ud ? ud->uid : s_OperServ) : s_OperServ, "RESV * %s :%s", mask, reason);
 }
 
-void ratbox_cmd_unsgline(const char *mask)
+void RatboxProto::cmd_unsgline(const char *mask)
 {
-    Uid *ud;
-
-    ud = find_uid(s_OperServ);
-    send_cmd((UseTS6 ? (ud ? ud->uid : s_OperServ) : s_OperServ),
-             "UNXLINE * %s", mask);
+	Uid *ud = find_uid(s_OperServ);
+	send_cmd(UseTS6 ? (ud ? ud->uid : s_OperServ) : s_OperServ, "UNXLINE * %s", mask);
 }
 
 void ratbox_cmd_unszline(const char *mask)
@@ -1548,7 +1545,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_242(ratbox_cmd_242);
     pmodule_cmd_243(ratbox_cmd_243);
     pmodule_cmd_211(ratbox_cmd_211);
-    pmodule_cmd_unsgline(ratbox_cmd_unsgline);
     pmodule_cmd_unszline(ratbox_cmd_unszline);
     pmodule_cmd_szline(ratbox_cmd_szline);
     pmodule_cmd_sgline(ratbox_cmd_sgline);
diff --git a/src/protocol/ratbox.h b/src/protocol/ratbox.h
index fa8ff9553..ecf2e3bd0 100644
--- a/src/protocol/ratbox.h
+++ b/src/protocol/ratbox.h
@@ -63,7 +63,6 @@ void ratbox_cmd_318(const char *source, const char *who);
 void ratbox_cmd_242(const char *buf);
 void ratbox_cmd_243(const char *buf);
 void ratbox_cmd_211(const char *buf);
-void ratbox_cmd_unsgline(const char *mask);
 void ratbox_cmd_unszline(const char *mask);
 void ratbox_cmd_szline(const char *mask, const char *reason, const char *whom);
 void ratbox_cmd_sgline(const char *mask, const char *reason);
@@ -105,4 +104,5 @@ class RatboxProto : public IRCDProtoNew {
 		void cmd_sqline(const char *, const char *);
 		void cmd_svsnick(const char *, const char *, time_t) { } // Ratbox doesn't have an SVSNICK command
 		void cmd_connect();
+		void cmd_unsgline(const char *);
 } ircd_proto;
diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c
index 90e93c795..e761f39de 100644
--- a/src/protocol/unreal32.c
+++ b/src/protocol/unreal32.c
@@ -1354,9 +1354,9 @@ void UnrealIRCdProto::cmd_release_svshold(const char *nick)
 /*
  * SVSNLINE - :realname mask
 */
-void unreal_cmd_unsgline(const char *mask)
+void UnrealIRCdProto::cmd_unsgline(const char *mask)
 {
-    send_cmd(NULL, "%s - :%s", send_token("SVSNLINE", "BR"), mask);
+	send_cmd(NULL, "%s - :%s", send_token("SVSNLINE", "BR"), mask);
 }
 
 /* UNSZLINE */
@@ -1938,7 +1938,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_242(unreal_cmd_242);
     pmodule_cmd_243(unreal_cmd_243);
     pmodule_cmd_211(unreal_cmd_211);
-    pmodule_cmd_unsgline(unreal_cmd_unsgline);
     pmodule_cmd_unszline(unreal_cmd_unszline);
     pmodule_cmd_szline(unreal_cmd_szline);
     pmodule_cmd_sgline(unreal_cmd_sgline);
diff --git a/src/protocol/unreal32.h b/src/protocol/unreal32.h
index 9ad2e5d4b..20127694a 100644
--- a/src/protocol/unreal32.h
+++ b/src/protocol/unreal32.h
@@ -98,7 +98,6 @@ void unreal_cmd_318(const char *source, const char *who);
 void unreal_cmd_242(const char *buf);
 void unreal_cmd_243(const char *buf);
 void unreal_cmd_211(const char *buf);
-void unreal_cmd_unsgline(const char *mask);
 void unreal_cmd_unszline(const char *mask);
 void unreal_cmd_szline(const char *mask, const char *reason, const char *whom);
 void unreal_cmd_sgline(const char *mask, const char *reason);
@@ -139,4 +138,5 @@ class UnrealIRCdProto : public IRCDProtoNew {
 		void cmd_connect();
 		void cmd_svshold(const char *);
 		void cmd_release_svshold(const char *);
+		void cmd_unsgline(const char *);
 } ircd_proto;