Replaced anope_SendGlobops() with direct call to SendGlobops() in IRCDProto class.

Added SendGlobopsInternal() function to IRCDProto class, now SendGlobops() is a stub to handle varargs.


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

7 files changed, 14 insertions, 14 deletions

diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c
index 975467972..298b0f987 100644
--- a/src/protocol/bahamut.c
+++ b/src/protocol/bahamut.c
@@ -185,7 +185,7 @@ void BahamutIRCdProto::ProcessUsermodes(User *user, int ac, const char **av)
 			case 'o':
 				if (add) {
 					++opcnt;
-					if (WallOper) anope_SendGlobops(s_OperServ, "\2%s\2 is now an IRC operator.", user->nick);
+					if (WallOper) ircdproto->SendGlobops(s_OperServ, "\2%s\2 is now an IRC operator.", user->nick);
 					display_news(user, NEWS_OPER);
 				}
 				else --opcnt;
diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c
index 840e35521..e867921d6 100644
--- a/src/protocol/charybdis.c
+++ b/src/protocol/charybdis.c
@@ -167,7 +167,7 @@ void CharybdisProto::ProcessUsermodes(User *user, int ac, const char **av)
 			case 'o':
 				if (add) {
 					++opcnt;
-					if (WallOper) anope_SendGlobops(s_OperServ, "\2%s\2 is now an IRC operator.", user->nick);
+					if (WallOper) ircdproto->SendGlobops(s_OperServ, "\2%s\2 is now an IRC operator.", user->nick);
 					display_news(user, NEWS_OPER);
 				}
 				else --opcnt;
@@ -434,7 +434,7 @@ CUMode myCumodes[128] = {
     {0}, {0}, {0}, {0}, {0}
 };
 
-void CharybdisProto::SendGlobops(const char *source, const char *buf)
+void CharybdisProto::SendGlobopsInternal(const char *source, const char *buf)
 {
 	if (!buf) return;
 	if (source) {
diff --git a/src/protocol/charybdis.h b/src/protocol/charybdis.h
index 2a9332de7..085c1f0d6 100644
--- a/src/protocol/charybdis.h
+++ b/src/protocol/charybdis.h
@@ -53,6 +53,7 @@ class CharybdisProto : public IRCDTS6Proto {
 		void SendNoticeChanopsInternal(const char *, const char *, const char *);
 		void SendQuitInternal(const char *, const char *);
 		void SendPartInternal(const char *, const char *, const char *);
+		void SendGlobopsInternal(const char *, const char *);
 	public:
 		void SendAkillDel(const char *, const char *);
 		void SendVhostDel(User *);
@@ -64,7 +65,6 @@ class CharybdisProto : public IRCDTS6Proto {
 		void SendJoin(const char *, const char *, time_t);
 		void SendSQLineDel(const char *);
 		void SendInvite(const char *, const char *, const char *);
-		void SendGlobops(const char *, const char *);
 		void SendSQLine(const char *, const char *);
 		void SendForceNickChange(const char *, const char *, time_t);
 		void SendVhost(const char *, const char *, const char *);
diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c
index fed17d4f4..638dce58c 100644
--- a/src/protocol/inspircd11.c
+++ b/src/protocol/inspircd11.c
@@ -421,7 +421,7 @@ void InspIRCdProto::ProcessUsermodes(User *user, int ac, const char **av)
 			case 'o':
 				if (add) {
 					++opcnt;
-					if (WallOper) anope_SendGlobops(s_OperServ, "\2%s\2 is now an IRC operator.", user->nick);
+					if (WallOper) ircdproto->SendGlobops(s_OperServ, "\2%s\2 is now an IRC operator.", user->nick);
 					display_news(user, NEWS_OPER);
 				}
 				else --opcnt;
@@ -524,7 +524,7 @@ void inspircd_cmd_chghost(const char *nick, const char *vhost)
     }
     send_cmd(s_OperServ, "CHGHOST %s %s", nick, vhost);
     } else {
-	anope_SendGlobops(s_OperServ, "CHGHOST not loaded!");
+	ircdproto->SendGlobops(s_OperServ, "CHGHOST not loaded!");
     }
 }
 
@@ -791,7 +791,7 @@ void inspircd_cmd_chgident(const char *nick, const char *vIdent)
     	}
     	send_cmd(s_OperServ, "CHGIDENT %s %s", nick, vIdent);
     } else {
-		anope_SendGlobops(s_OperServ, "CHGIDENT not loaded!");
+		ircdproto->SendGlobops(s_OperServ, "CHGIDENT not loaded!");
     }
 }
 
@@ -1201,13 +1201,13 @@ int anope_event_capab(const char *source, int ac, const char **av)
             return MOD_STOP;
         }
         if (!has_svsholdmod) {
-            anope_SendGlobops(s_OperServ, "SVSHOLD missing, Usage disabled until module is loaded.");
+            ircdproto->SendGlobops(s_OperServ, "SVSHOLD missing, Usage disabled until module is loaded.");
         }
         if (!has_chghostmod) {
-            anope_SendGlobops(s_OperServ, "CHGHOST missing, Usage disabled until module is loaded.");
+            ircdproto->SendGlobops(s_OperServ, "CHGHOST missing, Usage disabled until module is loaded.");
         }
         if (!has_chgidentmod) {
-            anope_SendGlobops(s_OperServ, "CHGIDENT missing, Usage disabled until module is loaded.");
+            ircdproto->SendGlobops(s_OperServ, "CHGIDENT missing, Usage disabled until module is loaded.");
         }
         if (has_messagefloodmod) {
             cbmi = myCbmodeinfos;
diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c
index b58d63688..94a0dd625 100644
--- a/src/protocol/ratbox.c
+++ b/src/protocol/ratbox.c
@@ -166,7 +166,7 @@ void RatboxProto::ProcessUsermodes(User *user, int ac, const char **av)
 			case 'o':
 				if (add) {
 					++opcnt;
-					if (WallOper) anope_SendGlobops(s_OperServ, "\2%s\2 is now an IRC operator.", user->nick);
+					if (WallOper) ircdproto->SendGlobops(s_OperServ, "\2%s\2 is now an IRC operator.", user->nick);
 					display_news(user, NEWS_OPER);
 				}
 				else --opcnt;
@@ -425,7 +425,7 @@ CUMode myCumodes[128] = {
 
 
 
-void RatboxProto::SendGlobops(const char *source, const char *buf)
+void RatboxProto::SendGlobopsInternal(const char *source, const char *buf)
 {
 	if (!buf) return;
 	if (source) {
diff --git a/src/protocol/ratbox.h b/src/protocol/ratbox.h
index 2466c0a3d..fa4c94989 100644
--- a/src/protocol/ratbox.h
+++ b/src/protocol/ratbox.h
@@ -52,6 +52,7 @@ class RatboxProto : public IRCDTS6Proto {
 		void SendNoticeChanopsInternal(const char *, const char *, const char *);
 		void SendQuitInternal(const char *, const char *);
 		void SendPartInternal(const char *, const char *, const char *);
+		void SendGlobopsInternal(const char *, const char *);
 	public:
 		void SendAkillDel(const char *, const char *);
 		void SendAkill(const char *, const char *, const char *, time_t, time_t, const char *);
@@ -62,7 +63,6 @@ class RatboxProto : public IRCDTS6Proto {
 		void SendJoin(const char *, const char *, time_t);
 		void SendSQLineDel(const char *);
 		void SendInvite(const char *, const char *, const char *);
-		void SendGlobops(const char *, const char *);
 		void SendSQLine(const char *, const char *);
 		void SendForceNickChange(const char *, const char *, time_t) { } // Ratbox doesn't have an SVSNICK command
 		void SendConnect();
diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c
index 61690dcaf..ada8e72c5 100644
--- a/src/protocol/unreal32.c
+++ b/src/protocol/unreal32.c
@@ -443,7 +443,7 @@ void UnrealIRCdProto::ProcessUsermodes(User *user, int ac, const char **av)
 			case 'o':
 				if (add) {
 					++opcnt;
-					if (WallOper) anope_SendGlobops(s_OperServ, "\2%s\2 is now an IRC operator.", user->nick);
+					if (WallOper) ircdproto->SendGlobops(s_OperServ, "\2%s\2 is now an IRC operator.", user->nick);
 					display_news(user, NEWS_OPER);
 				}
 				else --opcnt;