Rename a bunch of functions to use new scheme.

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

include/depricated.h

@@ -28,7 +28,7 @@
 
 #define set_umode(user, ac, av) anope_set_umode(user, ac, av)
 
-#define s_svsnoop(server, set) anope_cmd_svsnoop(server, set)
+#define s_svsnoop(server, set) anope_SendSVSNOOP(server, set)
 
 #define s_sqline(mask, reason) anope_cmd_sqline(mask, reason)
 
@@ -38,7 +38,7 @@
 #define s_unsqline(mask) anope_cmd_unsqline(mask)
 #define s_unszline(mask) anope_cmd_unszline(mask)
 
-#define s_rakill(user, host) anope_cmd_remove_akill(user, host)
+#define s_rakill(user, host) anope_SendAkillDel(user, host)
 
 
 # define NICKSERV_MODE ircd->nickservmode

include/extern.h

@@ -1120,7 +1120,7 @@ E void anope_cmd_capab();						  	  		  /* CAPAB */
 E void anope_cmd_chghost(const char *nick, const char *vhost);                   			  /* CHGHOST */
 E void anope_cmd_chgident(const char *nick, const char *vIdent);                 			  /* CHGIDENT */
 E void anope_cmd_vhost_on(const char *nick, const char *vIdent, const char *vhost);    			  /* CHGHOST + CHGIDENT */
-E void anope_cmd_vhost_off(User *u);
+E void anope_SendVhostDel(User *u);
 E void anope_cmd_connect();                             	           	  /* Connect */
 E void anope_cmd_ea();									  /* EA      */
 E void anope_cmd_global(const char *source, const char *fmt, ...);         	  		  /* GLOBOPS */
@@ -1147,7 +1147,7 @@ E void anope_cmd_action(const char *source, const char *dest, const char *fmt, .
 E void anope_cmd_serv_privmsg(const char *source, const char *dest, const char *msg);	  		  /* PRIVMSG */
 E void anope_cmd_protoctl();                                         			  /* PROTOCTL */
 E void anope_cmd_quit(const char *source, const char *fmt, ...);           	  		  /* QUIT */
-E void anope_cmd_remove_akill(const char *user, const char *host);			  		  /* RAKILL */
+E void anope_SendAkillDel(const char *user, const char *host);			  		  /* RAKILL */
 E void anope_cmd_sgline(const char *mask, const char *reason);			  	  		  /* SGLINE */
 E void anope_cmd_sqline(const char *mask, const char *reason);                   	  		  /* SQLINE */
 E void anope_cmd_szline(const char *mask, const char *reason, const char *whom);				  /* SZLINE */
@@ -1162,7 +1162,7 @@ E void anope_SendSVSKill(const char *source, const char *user, const char *fmt,
 E void anope_cmd_svsmode(User * u, int ac, const char **av);   	        	  		  /* SVSMODE */
 E void anope_cmd_svsmode_chan(const char *name, const char *mode, const char *nick);				  /* SVSMODE */
 E void anope_cmd_svsnick(const char *nick,const char *newnick, time_t when);     	  		  /* SVSNICK */
-E void anope_cmd_svsnoop(const char *server, int set);			  	  		  /* SVSNOOP */
+E void anope_SendSVSNOOP(const char *server, int set);			  	  		  /* SVSNOOP */
 E void anope_cmd_svso(const char *source,const char *nick, const char *flag);          	  		  /* SVSO   */
 E void anope_cmd_svspart(const char *source, const char *nick,const char *chan);          	  		  /* SVSPART   */
 E void anope_cmd_swhois(const char *source, const char *who, const char *mask);	  	  		  /* SWHOIS */

include/services.h

@@ -1231,10 +1231,10 @@ class IRCDProto;
 
 class IRCDProto {
 	public:
-		virtual void cmd_svsnoop(const char *, int) { }
-		virtual void cmd_remove_akill(const char *, const char *) = 0;
+		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 cmd_vhost_off(User *) { }
+		virtual void SendVhostDel(User *) { }
 		virtual void cmd_akill(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 cmd_svsmode(User *, int, const char **) = 0;

src/core/hs_off.c

@@ -76,7 +76,7 @@ int do_off(User * u)
             if (vhost == NULL && vident == NULL)
                 notice_lang(s_HostServ, u, HOST_NOT_ASSIGNED);
             else
-                anope_cmd_vhost_off(u);
+                anope_SendVhostDel(u);
         } else {
             notice_lang(s_HostServ, u, HOST_ID);
         }

src/core/os_noop.c

@@ -79,7 +79,7 @@ int do_noop(User * u)
         char reason[NICKMAX + 32];
 
         /* Remove the O:lines */
-        anope_cmd_svsnoop(server, 1);
+        anope_SendSVSNOOP(server, 1);
 
         snprintf(reason, sizeof(reason), "NOOP command used by %s",
                  u->nick);
@@ -97,7 +97,7 @@ int do_noop(User * u)
             }
         }
     } else if (!stricmp(cmd, "REVOKE")) {
-        anope_cmd_svsnoop(server, 0);
+        anope_SendSVSNOOP(server, 0);
         notice_lang(s_OperServ, u, OPER_NOOP_REVOKE, server);
     } else {
         syntax_error(s_OperServ, u, "NOOP", OPER_NOOP_SYNTAX);

src/ircd.c

@@ -43,14 +43,14 @@ void anope_set_umode(User *user, int ac, const char **av)
 	ircdproto->set_umode(user, ac, av);
 }
 
-void anope_cmd_svsnoop(const char *server, int set)
+void anope_SendSVSNOOP(const char *server, int set)
 {
-	ircdproto->cmd_svsnoop(server, set);
+	ircdproto->SendSVSNOOP(server, set);
 }
 
-void anope_cmd_remove_akill(const char *user, const char *host)
+void anope_SendAkillDel(const char *user, const char *host)
 {
-	ircdproto->cmd_remove_akill(user, host);
+	ircdproto->SendAkillDel(user, host);
 }
 
 void anope_cmd_topic(const char *whosets, const char *chan, const char *whosetit, const char *topic, time_t when)
@@ -58,9 +58,9 @@ void anope_cmd_topic(const char *whosets, const char *chan, const char *whosetit
 	ircdproto->cmd_topic(whosets, chan, whosetit, topic, when);
 }
 
-void anope_cmd_vhost_off(User *u)
+void anope_SendVhostDel(User *u)
 {
-	ircdproto->cmd_vhost_off(u);
+	ircdproto->SendVhostDel(u);
 }
 
 void anope_cmd_akill(const char *user, const char *host, const char *who, time_t when, time_t expires, const char *reason)

src/operserv.c

@@ -205,7 +205,7 @@ static void load_old_akill(void)
 
         /* No nicknames allowed! */
         if (strchr(ak->user, '!')) {
-            anope_cmd_remove_akill(ak->user, ak->host);
+            anope_SendAkillDel(ak->user, ak->host);
             free(ak);
             continue;
         }
@@ -241,7 +241,7 @@ static void load_old_akill(void)
                 if (match_wild_nocase(amask, mask2)
                     && (entry->expires >= ak->expires
                         || entry->expires == 0)) {
-                    anope_cmd_remove_akill(ak->user, ak->host);
+                    anope_SendAkillDel(ak->user, ak->host);
                     free(ak);
                     ak = NULL;
                     break;
@@ -914,7 +914,7 @@ static void free_akill_entry(SList * slist, void *item)
     Akill *ak = (Akill *)item;
 
     /* Remove the AKILLs from all the servers */
-    anope_cmd_remove_akill(ak->user, ak->host);
+    anope_SendAkillDel(ak->user, ak->host);
 
     /* Free the structure */
     free(ak->user);

src/protocol/bahamut.c

@@ -694,14 +694,14 @@ void BahamutIRCdProto::cmd_szline(const char *mask, const char *reason, const ch
 }
 
 /* SVSNOOP */
-void BahamutIRCdProto::cmd_svsnoop(const char *server, int set)
+void BahamutIRCdProto::SendSVSNOOP(const char *server, int set)
 {
 	send_cmd(NULL, "SVSNOOP %s %s", server, set ? "+" : "-");
 }
 
 void bahamut_cmd_svsadmin(const char *server, int set)
 {
-	ircd_proto.cmd_svsnoop(server, set);
+	ircd_proto.SendSVSNOOP(server, set);
 }
 
 /* SGLINE */
@@ -711,7 +711,7 @@ void BahamutIRCdProto::cmd_sgline(const char *mask, const char *reason)
 }
 
 /* RAKILL */
-void BahamutIRCdProto::cmd_remove_akill(const char *user, const char *host)
+void BahamutIRCdProto::SendAkillDel(const char *user, const char *host)
 {
 	send_cmd(NULL, "RAKILL %s %s", host, user);
 }

src/protocol/bahamut.h

@@ -60,8 +60,8 @@
 
 class BahamutIRCdProto : public IRCDProto {
 	public:
-		void cmd_svsnoop(const char *, int);
-		void cmd_remove_akill(const char *, const char *);
+		void SendSVSNOOP(const char *, int);
+		void SendAkillDel(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 SendSVSKill(const char *, const char *, const char *);

src/protocol/charybdis.c

@@ -729,13 +729,13 @@ void CharybdisProto::cmd_sgline(const char *mask, const char *reason)
 	send_cmd(UseTS6 ? (ud ? ud->uid : s_OperServ) : s_OperServ, "XLINE * %s 0 :%s", mask, reason);
 }
 
-void CharybdisProto::cmd_remove_akill(const char *user, const char *host)
+void CharybdisProto::SendAkillDel(const char *user, const char *host)
 {
 	Uid *ud = find_uid(s_OperServ);
 	send_cmd(UseTS6 ? (ud ? ud->uid : s_OperServ) : s_OperServ, "UNKLINE * %s %s", user, host);
 }
 
-void CharybdisProto::cmd_vhost_off(User *u)
+void CharybdisProto::SendVhostDel(User *u)
 {
 	send_cmd(UseTS6 ? TS6SID : ServerName, "ENCAP * CHGHOST %s :%s", u->nick, u->host);
 }

src/protocol/charybdis.h

@@ -48,8 +48,8 @@
 
 class CharybdisProto : public IRCDTS6Proto {
 	public:
-		void cmd_remove_akill(const char *, const char *);
-		void cmd_vhost_off(User *);
+		void SendAkillDel(const char *, const char *);
+		void SendVhostDel(User *);
 		void cmd_akill(const char *, const char *, const char *, time_t, time_t, const char *);
 		void SendSVSKill(const char *, const char *, const char *);
 		void cmd_svsmode(User *, int, const char **);

src/protocol/inspircd11.c

@@ -510,7 +510,7 @@ void inspircd_cmd_svsadmin(const char *server, int set)
     /* Not Supported by this IRCD */
 }
 
-void InspIRCdProto::cmd_remove_akill(const char *user, const char *host)
+void InspIRCdProto::SendAkillDel(const char *user, const char *host)
 {
 	send_cmd(s_OperServ, "GLINE %s@%s", user, host);
 }
@@ -533,7 +533,7 @@ void inspircd_cmd_chghost(const char *nick, const char *vhost)
     }
 }
 
-void InspIRCdProto::cmd_vhost_off(User *u)
+void InspIRCdProto::SendVhostDel(User *u)
 {
 	inspircd_cmd_chghost(u->nick, (u->mode & umodes['x']) ? u->chost.c_str() : u->host);
 }

src/protocol/inspircd11.h

@@ -65,9 +65,9 @@ int anope_event_rsquit(const char *source, int ac, const char **av);
 
 class InspIRCdProto : public IRCDProto {
 	public:
-		void cmd_remove_akill(const char *, const char *);
+		void SendAkillDel(const char *, const char *);
 		void cmd_topic(const char *, const char *, const char *, const char *, time_t);
-		void cmd_vhost_off(User *);
+		void SendVhostDel(User *);
 		void cmd_akill(const char *, const char *, const char *, time_t, time_t, const char *);
 		void SendSVSKill(const char *, const char *, const char *);
 		void cmd_svsmode(User *, int, const char **);

src/protocol/obsolete/hybrid.c

@@ -692,7 +692,7 @@ void hybrid_cmd_sgline(const char *mask, const char *reason)
     send_cmd(ServerName, "XLINE * %s 0 :%s", mask, reason);
 }
 
-void HybridIRCdProto::cmd_remove_akill(const char *user, const char *host)
+void HybridIRCdProto::SendAkillDel(const char *user, const char *host)
 {
 	/* hybrid seems to support UNKLINE  -Certus */
 	send_cmd(s_OperServ, "UNKLINE * %s %s", user, host);
@@ -704,7 +704,7 @@ void hybrid_cmd_topic(const char *whosets, const char *chan, const char *whoseti
     send_cmd(whosets, "TOPIC %s :%s", chan, topic);
 }
 
-void hybrid_cmd_vhost_off(User * u)
+void hybrid_SendVhostDel(User * u)
 {
     /* does not support vhosting */
 }
@@ -1454,9 +1454,9 @@ void hybrid_cmd_ctcp(const char *source, const char *dest, const char *buf)
 void moduleAddAnopeCmds()
 {
     pmodule_cmd_topic(hybrid_cmd_topic);
-    pmodule_cmd_vhost_off(hybrid_cmd_vhost_off);
+    pmodule_SendVhostDel(hybrid_cmd_vhost_off);
     pmodule_cmd_akill(hybrid_cmd_akill);
-    pmodule_SendSVSKill(hybrid_cmd_svskill);
+    pmodule_SendSVSKill(hybrid_SendSVSKill);
     pmodule_cmd_svsmode(hybrid_cmd_svsmode);
     pmodule_cmd_372(hybrid_cmd_372);
     pmodule_cmd_372_error(hybrid_cmd_372_error);

src/protocol/obsolete/hybrid.h

@@ -45,7 +45,7 @@
 
 void hybrid_set_umode(User * user, int ac, const char **av);
 void hybrid_cmd_topic(const char *whosets, const char *chan, const char *whosetit, const char *topic, time_t when);
-void hybrid_cmd_vhost_off(User * u);
+void hybrid_SendVhostDel(User * u);
 void hybrid_cmd_akill(const char *user, const char *host, const char *who, time_t when,time_t expires, const char *reason);
 void hybrid_SendSVSKill(const char *source, const char *user, const char *buf);
 void hybrid_cmd_svsmode(User * u, int ac, const char **av);
@@ -114,5 +114,5 @@ void hybrid_cmd_ctcp(const char *source, const char *dest, const char *buf);
 
 class HybridIRCdProto : public IRCDProtoNew {
 	public:
-		void cmd_remove_akill(const char *, const char *);
+		void SendAkillDel(const char *, const char *);
 } ircd_proto;

src/protocol/obsolete/plexus3.c

@@ -776,7 +776,7 @@ plexus_cmd_szline (const char *mask, const char *reason, const char *whom)
   /* Does not support */
 }
 
-void PleXusIRCdProto::cmd_svsnoop(const char *server, int set)
+void PleXusIRCdProto::SendSVSNOOP(const char *server, int set)
 {
 	send_cmd(ServerName, "ENCAP %s SVSNOOP %s", server, set ? "+" : "-");
 }
@@ -784,7 +784,7 @@ void PleXusIRCdProto::cmd_svsnoop(const char *server, int set)
 void
 plexus_cmd_svsadmin (const char *server, int set)
 {
-	ircd_proto.cmd_svsnoop(server, set);
+	ircd_proto.SendSVSNOOP(server, set);
 }
 
 void
@@ -793,7 +793,7 @@ plexus_cmd_sgline (const char *mask, const char *reason)
   send_cmd (s_OperServ, "XLINE * %s 0 :%s", mask, reason);
 }
 
-void PleXusIRCdProto::cmd_remove_akill(const char *user, const char *host)
+void PleXusIRCdProto::SendAkillDel(const char *user, const char *host)
 {
 	send_cmd(s_OperServ, "UNKLINE * %s %s", user, host);
 }
@@ -807,7 +807,7 @@ plexus_cmd_topic (const char *whosets, const char *chan, const char *whosetit,
 }
 
 void
-plexus_cmd_vhost_off (User * u)
+plexus_SendVhostDel (User * u)
 {
   common_svsmode (u, "-x", NULL);
 }
@@ -1738,9 +1738,9 @@ void
 moduleAddAnopeCmds ()
 {
   pmodule_cmd_topic (plexus_cmd_topic);
-  pmodule_cmd_vhost_off (plexus_cmd_vhost_off);
+  pmodule_SendVhostDel (plexus_cmd_vhost_off);
   pmodule_cmd_akill (plexus_cmd_akill);
-  pmodule_SendSVSKill (plexus_cmd_svskill);
+  pmodule_SendSVSKill (plexus_SendSVSKill);
   pmodule_cmd_svsmode (plexus_cmd_svsmode);
   pmodule_cmd_372 (plexus_cmd_372);
   pmodule_cmd_372_error (plexus_cmd_372_error);

src/protocol/obsolete/plexus3.h

@@ -41,7 +41,7 @@
 
 void plexus_set_umode(User * user, int ac, const char **av);
 void plexus_cmd_topic(const char *whosets, const char *chan, const char *whosetit, const char *topic, time_t when);
-void plexus_cmd_vhost_off(User * u);
+void plexus_SendVhostDel(User * u);
 void plexus_cmd_akill(const char *user, const char *host, const char *who, time_t when,time_t expires, const char *reason);
 void plexus_SendSVSKill(const char *source, const char *user, const char *buf);
 void plexus_cmd_svsmode(User * u, int ac, const char **av);
@@ -110,6 +110,6 @@ void plexus_cmd_ctcp(const char *source, const char *dest, const char *buf);
 
 class PleXusIRCdProto : public IRCDProtoNew {
 	public:
-		void cmd_svsnoop(const char *, int);
-		void cmd_remove_akill(const char *, const char *);
+		void SendSVSNOOP(const char *, int);
+		void SendAkillDel(const char *, const char *);
 } ircd_proto;

src/protocol/obsolete/ptlink.c

@@ -680,14 +680,14 @@ void ptlink_cmd_sqline(const char *mask, const char *reason)
 	  operations:
 		noopers - remove existing opers and disable o:lines
 */
-void PTlinkProto::cmd_svsnoop(const char *server, int set)
+void PTlinkProto::SendSVSNOOP(const char *server, int set)
 {
 	send_cmd(NULL, "SVSADMIN %s :%s", server, set ? "noopers" : "rehash");
 }
 
 void ptlink_cmd_svsadmin(const char *server, int set)
 {
-	ircd_proto.cmd_svsnoop(server, set);
+	ircd_proto.SendSVSNOOP(server, set);
 }
 
 /*
@@ -695,7 +695,7 @@ void ptlink_cmd_svsadmin(const char *server, int set)
 	parv[0] = sender (server if on network synchronization)
 	parv[1] = glined usert@host mask or ALL to remove all glines
 */
-void PTlinkProto::cmd_remove_akill(const char *user, const char *host)
+void PTlinkProto::SendAkillDel(const char *user, const char *host)
 {
 	send_cmd(NULL, "UNGLINE %s@%s", user, host);
 }
@@ -1255,7 +1255,7 @@ void ptlink_cmd_topic(const char *whosets, const char *chan, const char *whoseti
              (long int) time(NULL), topic);
 }
 
-void ptlink_cmd_vhost_off(User * u)
+void ptlink_SendVhostDel(User * u)
 {
     /* does not support vhosting */
 }
@@ -1683,9 +1683,9 @@ void ptlink_cmd_ctcp(const char *source, const char *dest, const char *buf)
 void moduleAddAnopeCmds()
 {
     pmodule_cmd_topic(ptlink_cmd_topic);
-    pmodule_cmd_vhost_off(ptlink_cmd_vhost_off);
+    pmodule_SendVhostDel(ptlink_cmd_vhost_off);
     pmodule_cmd_akill(ptlink_cmd_akill);
-    pmodule_SendSVSKill(ptlink_cmd_svskill);
+    pmodule_SendSVSKill(ptlink_SendSVSKill);
     pmodule_cmd_svsmode(ptlink_cmd_svsmode);
     pmodule_cmd_372(ptlink_cmd_372);
     pmodule_cmd_372_error(ptlink_cmd_372_error);

src/protocol/obsolete/ptlink.h

@@ -80,7 +80,7 @@
 
 void ptlink_set_umode(User * user, int ac, const char **av);
 void ptlink_cmd_topic(const char *whosets, const char *chan, const char *whosetit, const char *topic, time_t when);
-void ptlink_cmd_vhost_off(User * u);
+void ptlink_SendVhostDel(User * u);
 void ptlink_cmd_akill(const char *user, const char *host, const char *who, time_t when,time_t expires, const char *reason);
 void ptlink_SendSVSKill(const char *source, const char *user, const char *buf);
 void ptlink_cmd_svsmode(User * u, int ac, const char **av);
@@ -149,6 +149,6 @@ void ptlink_cmd_ctcp(const char *source, const char *dest, const char *buf);
 
 class PTlinkProto : public IRCDProtoNew {
 	public:
-		void cmd_svsnoop(const char *, int);
-		void cmd_remove_akill(const char *, const char *);
+		void SendSVSNOOP(const char *, int);
+		void SendAkillDel(const char *, const char *);
 } ircd_proto;

src/protocol/obsolete/rageircd.c

@@ -620,14 +620,14 @@ void rageircd_cmd_szline(const char *mask, const char *reason, const char *whom)
     send_cmd(NULL, "SZLINE %s :%s", mask, reason);
 }
 
-void RageIRCdProto::cmd_svsnoop(const char *server, int set)
+void RageIRCdProto::SendSVSNOOP(const char *server, int set)
 {
 	send_cmd(NULL, "SVSNOOP %s %s", server, set ? "+" : "-");
 }
 
 void rageircd_cmd_svsadmin(const char *server, int set)
 {
-	ircd_proto.cmd_svsnoop(server, set);
+	ircd_proto.SendSVSNOOP(server, set);
 }
 
 void rageircd_cmd_sgline(const char *mask, const char *reason)
@@ -636,7 +636,7 @@ void rageircd_cmd_sgline(const char *mask, const char *reason)
 
 }
 
-void RageIRCdProto::cmd_remove_akill(const char *user, const char *host)
+void RageIRCdProto::SendAkillDel(const char *user, const char *host)
 {
 	send_cmd(NULL, "RAKILL %s %s", host, user);
 }
@@ -663,7 +663,7 @@ void rageircd_cmd_topic(const char *whosets, const char *chan, const char *whose
              (unsigned long int) when, topic);
 }
 
-void rageircd_cmd_vhost_off(User * u)
+void rageircd_SendVhostDel(User * u)
 {
     send_cmd(s_HostServ, "SVSMODE %s -x", u->nick);
     notice_lang(s_HostServ, u, HOST_OFF_UNREAL, u->nick, ircd->vhostchar);
@@ -1563,9 +1563,9 @@ void rageircd_cmd_ctcp(const char *source, const char *dest, const char *buf)
 void moduleAddAnopeCmds()
 {
     pmodule_cmd_topic(rageircd_cmd_topic);
-    pmodule_cmd_vhost_off(rageircd_cmd_vhost_off);
+    pmodule_SendVhostDel(rageircd_cmd_vhost_off);
     pmodule_cmd_akill(rageircd_cmd_akill);
-    pmodule_SendSVSKill(rageircd_cmd_svskill);
+    pmodule_SendSVSKill(rageircd_SendSVSKill);
     pmodule_cmd_svsmode(rageircd_cmd_svsmode);
     pmodule_cmd_372(rageircd_cmd_372);
     pmodule_cmd_372_error(rageircd_cmd_372_error);

src/protocol/obsolete/rageircd.h

@@ -43,7 +43,7 @@
 
 void rageircd_set_umode(User * user, int ac, const char **av);
 void rageircd_cmd_topic(const char *whosets, const char *chan, const char *whosetit, const char *topic, time_t when);
-void rageircd_cmd_vhost_off(User * u);
+void rageircd_SendVhostDel(User * u);
 void rageircd_cmd_akill(const char *user, const char *host, const char *who, time_t when,time_t expires, const char *reason);
 void rageircd_SendSVSKill(const char *source, const char *user, const char *buf);
 void rageircd_cmd_svsmode(User * u, int ac, const char **av);
@@ -112,6 +112,6 @@ void rageircd_cmd_ctcp(const char *source, const char *dest, const char *buf);
 
 class RageIRCdProto : public IRCDProtoNew {
 	public:
-		void cmd_svsnoop(const char *, int);
-		void cmd_remove_akill(const char *, const char *);
+		void SendSVSNOOP(const char *, int);
+		void SendAkillDel(const char *, const char *);
 } ircd_proto;

src/protocol/obsolete/solidircd.c

@@ -755,14 +755,14 @@ void solidircd_cmd_szline(const char *mask, const char *reason, const char *whom
 }
 
 /* SVSNOOP */
-void SolidIRCdProto::cmd_svsnoop(const char *server, int set)
+void SolidIRCdProto::SendSVSNOOP(const char *server, int set)
 {
 	send_cmd(NULL, "SVSNOOP %s %s", server, set ? "+" : "-");
 }
 
 void solidircd_cmd_svsadmin(const char *server, int set)
 {
-	ircd_proto.cmd_svsnoop(server, set);
+	ircd_proto.SendSVSNOOP(server, set);
 }
 
 /* SGLINE */
@@ -772,7 +772,7 @@ void solidircd_cmd_sgline(const char *mask, const char *reason)
 }
 
 /* RAKILL */
-void SolidIRCdProto::cmd_remove_akill(const char *user, const char *host)
+void SolidIRCdProto::SendAkillDel(const char *user, const char *host)
 {
 	send_cmd(NULL, "RAKILL %s %s", host, user);
 }
@@ -1383,7 +1383,7 @@ void solidircd_cmd_vhost_on(const char *nick, const char *vIdent, const char *vh
     solidircd_cmd_chghost(nick, vhost);
 }
 
-void solidircd_cmd_vhost_off(User * u)
+void solidircd_SendVhostDel(User * u)
 {
     send_cmd(s_HostServ, "SVSMODE %s -v", u->nick);
     notice_lang(s_HostServ, u, HOST_OFF_UNREAL, u->nick, ircd->vhostchar);
@@ -1596,9 +1596,9 @@ void solidircd_cmd_ctcp(const char *source, const char *dest, const char *buf)
 void moduleAddAnopeCmds()
 {
     pmodule_cmd_topic(solidircd_cmd_topic);
-    pmodule_cmd_vhost_off(solidircd_cmd_vhost_off);
+    pmodule_SendVhostDel(solidircd_cmd_vhost_off);
     pmodule_cmd_akill(solidircd_cmd_akill);
-    pmodule_SendSVSKill(solidircd_cmd_svskill);
+    pmodule_SendSVSKill(solidircd_SendSVSKill);
     pmodule_cmd_svsmode(solidircd_cmd_svsmode);
     pmodule_cmd_372(solidircd_cmd_372);
     pmodule_cmd_372_error(solidircd_cmd_372_error);

src/protocol/obsolete/solidircd.h

@@ -67,7 +67,7 @@
 
 void solidircd_set_umode(User * user, int ac, const char **av);
 void solidircd_cmd_topic(const char *whosets, const char *chan, const char *whosetit, const char *topic, time_t when);
-void solidircd_cmd_vhost_off(User * u);
+void solidircd_SendVhostDel(User * u);
 void solidircd_cmd_akill(const char *user, const char *host, const char *who, time_t when,time_t expires, const char *reason);
 void solidircd_SendSVSKill(const char *source, const char *user, const char *buf);
 void solidircd_cmd_svsmode(User * u, int ac, const char **av);
@@ -136,6 +136,6 @@ void solidircd_cmd_ctcp(const char *source, const char *dest, const char *buf);
 
 class SolidIRCdProto : public IRCDProtoNew {
 	public:
-		void cmd_svsnoop(const char *, int);
-		void cmd_remove_akill(const char *, const char *);
+		void SendSVSNOOP(const char *, int);
+		void SendAkillDel(const char *, const char *);
 } ircd_proto;

src/protocol/obsolete/ultimate3.c

@@ -695,14 +695,14 @@ void ultimate3_cmd_szline(const char *mask, const char *reason, const char *whom
     /* send_cmd(NULL, "SZLINE %s :%s", mask, reason); */
 }
 
-void UltimateIRCdProto::cmd_svsnoop(const char *server, int set)
+void UltimateIRCdProto::SendSVSNOOP(const char *server, int set)
 {
 	send_cmd(NULL, "SVSNOOP %s %s", server, set ? "+" : "-");
 }
 
 void ultimate3_cmd_svsadmin(const char *server, int set)
 {
-	ircd_proto.cmd_svsnoop(server, set);
+	ircd_proto.SendSVSNOOP(server, set);
 }
 
 void ultimate3_cmd_sgline(const char *mask, const char *reason)
@@ -710,12 +710,12 @@ void ultimate3_cmd_sgline(const char *mask, const char *reason)
     send_cmd(NULL, "SGLINE %d :%s:%s", (int)strlen(mask), mask, reason);
 }
 
-void UltimateIRCdProto::cmd_remove_akill(const char *user, const char *host)
+void UltimateIRCdProto::SendAkillDel(const char *user, const char *host)
 {
 	send_cmd(NULL, "RAKILL %s %s", host, user);
 }
 
-void ultimate3_cmd_vhost_off(User * u)
+void ultimate3_SendVhostDel(User * u)
 {
     send_cmd(s_HostServ, "SVSMODE %s -x", u->nick);
     notice_lang(s_HostServ, u, HOST_OFF_UNREAL, u->nick, ircd->vhostchar);
@@ -1704,9 +1704,9 @@ void ultimate3_cmd_ctcp(const char *source, const char *dest, const char *buf)
 void moduleAddAnopeCmds()
 {
     pmodule_cmd_topic(ultimate3_cmd_topic);
-    pmodule_cmd_vhost_off(ultimate3_cmd_vhost_off);
+    pmodule_SendVhostDel(ultimate3_cmd_vhost_off);
     pmodule_cmd_akill(ultimate3_cmd_akill);
-    pmodule_SendSVSKill(ultimate3_cmd_svskill);
+    pmodule_SendSVSKill(ultimate3_SendSVSKill);
     pmodule_cmd_svsmode(ultimate3_cmd_svsmode);
     pmodule_cmd_372(ultimate3_cmd_372);
     pmodule_cmd_372_error(ultimate3_cmd_372_error);

src/protocol/obsolete/ultimate3.h

@@ -53,7 +53,7 @@
 
 void ultimate3_set_umode(User * user, int ac, const char **av);
 void ultimate3_cmd_topic(const char *whosets, const char *chan, const char *whosetit, const char *topic, time_t when);
-void ultimate3_cmd_vhost_off(User * u);
+void ultimate3_SendVhostDel(User * u);
 void ultimate3_cmd_akill(const char *user, const char *host, const char *who, time_t when,time_t expires, const char *reason);
 void ultimate3_SendSVSKill(const char *source, const char *user, const char *buf);
 void ultimate3_cmd_svsmode(User * u, int ac, const char **av);
@@ -122,6 +122,6 @@ void ultimate3_cmd_ctcp(const char *source, const char *dest, const char *buf);
 
 class UltimateIRCdProto : public IRCDProtoNew {
 	public:
-		void cmd_svsnoop(const char *, int);
-		void cmd_remove_akill(const char *, const char *);
+		void SendSVSNOOP(const char *, int);
+		void SendAkillDel(const char *, const char *);
 } ircd_proto;

src/protocol/obsolete/viagra.c

@@ -766,14 +766,14 @@ void viagra_cmd_szline(const char *mask, const char *reason, const char *whom)
     send_cmd(NULL, "SZLINE %s :%s", mask, reason);
 }
 
-void ViagraIRCdProto::cmd_svsnoop(const char *server, int set)
+void ViagraIRCdProto::SendSVSNOOP(const char *server, int set)
 {
 	send_cmd(NULL, "SVSNOOP %s %s", server, set ? "+" : "-");
 }
 
 void viagra_cmd_svsadmin(const char *server, int set)
 {
-	ircd_proto.cmd_svsnoop(server, set);
+	ircd_proto.SendSVSNOOP(server, set);
 }
 
 void viagra_cmd_sgline(const char *mask, const char *reason)
@@ -781,7 +781,7 @@ void viagra_cmd_sgline(const char *mask, const char *reason)
     send_cmd(NULL, "SGLINE %d :%s:%s", (int)strlen(mask), mask, reason);
 }
 
-void ViagraIRCdProto::cmd_remove_akill(const char *user, const char *host)
+void ViagraIRCdProto::SendAkillDel(const char *user, const char *host)
 {
 	send_cmd(NULL, "RAKILL %s %s", host, user);
 }
@@ -807,7 +807,7 @@ void viagra_cmd_topic(const char *whosets, const char *chan, const char *whoseti
              (unsigned long int) when, topic);
 }
 
-void viagra_cmd_vhost_off(User * u)
+void viagra_SendVhostDel(User * u)
 {
     send_cmd(NULL, "SVSMODE %s -x", u->nick);
     notice_lang(s_HostServ, u, HOST_OFF_UNREAL, u->nick, ircd->vhostchar);
@@ -1603,9 +1603,9 @@ void viagra_cmd_ctcp(const char *source, const char *dest, const char *buf)
 void moduleAddAnopeCmds()
 {
     pmodule_cmd_topic(viagra_cmd_topic);
-    pmodule_cmd_vhost_off(viagra_cmd_vhost_off);
+    pmodule_SendVhostDel(viagra_cmd_vhost_off);
     pmodule_cmd_akill(viagra_cmd_akill);
-    pmodule_SendSVSKill(viagra_cmd_svskill);
+    pmodule_SendSVSKill(viagra_SendSVSKill);
     pmodule_cmd_svsmode(viagra_cmd_svsmode);
     pmodule_cmd_372(viagra_cmd_372);
     pmodule_cmd_372_error(viagra_cmd_372_error);

src/protocol/obsolete/viagra.h

@@ -62,7 +62,7 @@
 
 void viagra_set_umode(User * user, int ac, const char **av);
 void viagra_cmd_topic(const char *whosets, const char *chan, const char *whosetit, const char *topic, time_t when);
-void viagra_cmd_vhost_off(User * u);
+void viagra_SendVhostDel(User * u);
 void viagra_cmd_akill(const char *user, const char *host, const char *who, time_t when,time_t expires, const char *reason);
 void viagra_SendSVSKill(const char *source, const char *user, const char *buf);
 void viagra_cmd_svsmode(User * u, int ac, const char **av);
@@ -131,6 +131,6 @@ void viagra_cmd_ctcp(const char *source, const char *dest, const char *buf);
 
 class ViagraIRCdProto : public IRCDProtoNew {
 	public:
-		void cmd_svsnoop(const char *, int);
-		void cmd_remove_akill(const char *, const char *);
+		void SendSVSNOOP(const char *, int);
+		void SendAkillDel(const char *, const char *);
 } ircd_proto;

src/protocol/ratbox.c

@@ -699,7 +699,7 @@ void RatboxProto::cmd_sgline(const char *mask, const char *reason)
 	send_cmd(UseTS6 ? (ud ? ud->uid : s_OperServ) : s_OperServ, "XLINE * %s 0 :%s", mask, reason);
 }
 
-void RatboxProto::cmd_remove_akill(const char *user, const char *host)
+void RatboxProto::SendAkillDel(const char *user, const char *host)
 {
 	Uid *ud = find_uid(s_OperServ);
 	send_cmd(UseTS6 ? (ud ? ud->uid : s_OperServ) : s_OperServ, "UNKLINE * %s %s", user, host);

src/protocol/ratbox.h

@@ -47,7 +47,7 @@
 
 class RatboxProto : public IRCDProto {
 	public:
-		void cmd_remove_akill(const char *, const char *);
+		void SendAkillDel(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 SendSVSKill(const char *, const char *, const char *);

src/protocol/unreal32.c

@@ -478,17 +478,17 @@ int anope_event_capab(const char *source, int ac, const char **av)
 }
 
 /* SVSNOOP */
-void UnrealIRCdProto::cmd_svsnoop(const char *server, int set)
+void UnrealIRCdProto::SendSVSNOOP(const char *server, int set)
 {
 	send_cmd(NULL, "%s %s %s", send_token("SVSNOOP", "f"), server, set ? "+" : "-");
 }
 
 void unreal_cmd_svsadmin(const char *server, int set)
 {
-	ircd_proto.cmd_svsnoop(server, set);
+	ircd_proto.SendSVSNOOP(server, set);
 }
 
-void UnrealIRCdProto::cmd_remove_akill(const char *user, const char *host)
+void UnrealIRCdProto::SendAkillDel(const char *user, const char *host)
 {
 	send_cmd(NULL, "%s - G %s %s %s", send_token("TKL", "BD"), user, host, s_OperServ);
 }
@@ -498,7 +498,7 @@ void UnrealIRCdProto::cmd_topic(const char *whosets, const char *chan, const cha
 	send_cmd(whosets, "%s %s %s %lu :%s", send_token("TOPIC", ")"), chan, whosetit, static_cast<unsigned long>(when), topic);
 }
 
-void UnrealIRCdProto::cmd_vhost_off(User *u)
+void UnrealIRCdProto::SendVhostDel(User *u)
 {
 	if (UseSVS2MODE) send_cmd(s_HostServ, "%s %s -xt", send_token("SVS2MODE", "v"), u->nick);
 	else send_cmd(s_HostServ, "%s %s -xt", send_token("SVSMODE", "n"), u->nick);

src/protocol/unreal32.h

@@ -82,10 +82,10 @@
 
 class UnrealIRCdProto : public IRCDProto {
 	public:
-		void cmd_svsnoop(const char *, int);
-		void cmd_remove_akill(const char *, const char *);
+		void SendSVSNOOP(const char *, int);
+		void SendAkillDel(const char *, const char *);
 		void cmd_topic(const char *, const char *, const char *, const char *, time_t);
-		void cmd_vhost_off(User *);
+		void SendVhostDel(User *);
 		void cmd_akill(const char *, const char *, const char *, time_t, time_t, const char *);
 		void SendSVSKill(const char *, const char *, const char *);
 		void cmd_svsmode(User *, int, const char **);