Replaced anope_SendKick() with direct call to SendKick() in IRCDProto class.

Also added SendKickInternal() function to IRCDProto class, now SendKick() is a stub to handle varargs.


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

6 files changed, 22 insertions, 22 deletions

diff --git a/src/core/cs_ban.c b/src/core/cs_ban.c
index 92f8b7733..c3ea133e2 100644
--- a/src/core/cs_ban.c
+++ b/src/core/cs_ban.c
@@ -125,10 +125,10 @@ int do_ban(User * u)
                 if ((ci->flags & CI_SIGNKICK)
                     || ((ci->flags & CI_SIGNKICK_LEVEL)
                         && !check_access(u, ci, CA_SIGNKICK)))
-                    anope_SendKick(whosends(ci), ci->name, u->nick,
+                    ircdproto->SendKick(whosends(ci), ci->name, u->nick,
                                    "%s (%s)", reason, u->nick);
                 else
-                    anope_SendKick(whosends(ci), ci->name, u->nick, "%s",
+                    ircdproto->SendKick(whosends(ci), ci->name, u->nick, "%s",
                                    reason);
 
 		const char *kav[4];
@@ -185,10 +185,10 @@ int do_ban(User * u)
         if ((ci->flags & CI_SIGNKICK)
             || ((ci->flags & CI_SIGNKICK_LEVEL)
                 && !check_access(u, ci, CA_SIGNKICK)))
-            anope_SendKick(whosends(ci), ci->name, params, "%s (%s)",
+            ircdproto->SendKick(whosends(ci), ci->name, params, "%s (%s)",
                            reason, u->nick);
         else
-            anope_SendKick(whosends(ci), ci->name, params, "%s", reason);
+            ircdproto->SendKick(whosends(ci), ci->name, params, "%s", reason);
 
 	const char *kav[4];
         kav[0] = ci->name;
diff --git a/src/core/cs_clear.c b/src/core/cs_clear.c
index 989c8ffce..a89b091cd 100644
--- a/src/core/cs_clear.c
+++ b/src/core/cs_clear.c
@@ -358,7 +358,7 @@ int do_clear(User * u)
             av[0] = sstrdup(chan);
             av[1] = sstrdup(cu->user->nick);
             av[2] = sstrdup(buf);
-            anope_SendKick(whosends(ci), av[0], av[1], av[2]);
+            ircdproto->SendKick(whosends(ci), av[0], av[1], av[2]);
             do_kick(s_ChanServ, 3, av);
             free((void *)av[2]);
             free((void *)av[1]);
diff --git a/src/core/cs_forbid.c b/src/core/cs_forbid.c
index 20209ddce..dc70d939f 100644
--- a/src/core/cs_forbid.c
+++ b/src/core/cs_forbid.c
@@ -6,8 +6,8 @@
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
- * Based on the original code of Services by Andy Church. 
- * 
+ * Based on the original code of Services by Andy Church.
+ *
  * $Id$
  *
  */
@@ -112,7 +112,7 @@ int do_forbid(User * u)
                 av[0] = c->name;
                 av[1] = cu->user->nick;
                 av[2] = reason ? reason : "CHAN_FORBID_REASON";
-                anope_SendKick(s_ChanServ, av[0], av[1], av[2]);
+                ircdproto->SendKick(s_ChanServ, av[0], av[1], av[2]);
                 do_kick(s_ChanServ, 3, av);
             }
         }
diff --git a/src/core/cs_kick.c b/src/core/cs_kick.c
index 44e076d58..4cc6681a2 100644
--- a/src/core/cs_kick.c
+++ b/src/core/cs_kick.c
@@ -6,8 +6,8 @@
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
- * Based on the original code of Services by Andy Church. 
- * 
+ * Based on the original code of Services by Andy Church.
+ *
  * $Id$
  *
  */
@@ -96,10 +96,10 @@ int do_cs_kick(User * u)
                 if ((ci->flags & CI_SIGNKICK)
                     || ((ci->flags & CI_SIGNKICK_LEVEL)
                         && !check_access(u, ci, CA_SIGNKICK)))
-                    anope_SendKick(whosends(ci), ci->name, u->nick,
+                    ircdproto->SendKick(whosends(ci), ci->name, u->nick,
                                    "%s (%s)", reason, u->nick);
                 else
-                    anope_SendKick(whosends(ci), ci->name, u->nick, "%s",
+                    ircdproto->SendKick(whosends(ci), ci->name, u->nick, "%s",
                                    reason);
                 av[0] = ci->name;
                 av[1] = u->nick;
@@ -139,10 +139,10 @@ int do_cs_kick(User * u)
         if ((ci->flags & CI_SIGNKICK)
             || ((ci->flags & CI_SIGNKICK_LEVEL)
                 && !check_access(u, ci, CA_SIGNKICK)))
-            anope_SendKick(whosends(ci), ci->name, params, "%s (%s)",
+            ircdproto->SendKick(whosends(ci), ci->name, params, "%s (%s)",
                            reason, u->nick);
         else
-            anope_SendKick(whosends(ci), ci->name, params, "%s", reason);
+            ircdproto->SendKick(whosends(ci), ci->name, params, "%s", reason);
         av[0] = ci->name;
         av[1] = params;
         av[2] = reason;
diff --git a/src/core/cs_suspend.c b/src/core/cs_suspend.c
index 855e6b531..f97b5c54a 100644
--- a/src/core/cs_suspend.c
+++ b/src/core/cs_suspend.c
@@ -6,8 +6,8 @@
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
- * Based on the original code of Services by Andy Church. 
- * 
+ * Based on the original code of Services by Andy Church.
+ *
  * $Id$
  *
  */
@@ -92,7 +92,7 @@ int do_suspend(User * u)
         notice_lang(s_ChanServ, u, CHAN_UNSUSPEND_ERROR);
         return MOD_CONT;
     }
-    
+
     /* Only SUSPEND existing channels, otherwise use FORBID (bug #54) */
     if ((ci = cs_findchan(chan)) == NULL) {
         notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
@@ -127,7 +127,7 @@ int do_suspend(User * u)
                 av[0] = c->name;
                 av[1] = cu->user->nick;
                 av[2] = reason ? reason : "CHAN_SUSPEND_REASON";
-                anope_SendKick(s_ChanServ, av[0], av[1], av[2]);
+                ircdproto->SendKick(s_ChanServ, av[0], av[1], av[2]);
                 do_kick(s_ChanServ, 3, av);
             }
         }
@@ -173,7 +173,7 @@ int do_unsuspend(User * u)
         notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
         return MOD_CONT;
     }
-    
+
     if (!(ci->flags & CI_SUSPENDED))
     {
         notice_lang(s_ChanServ, u, CHAN_UNSUSPEND_FAILED, chan);
diff --git a/src/core/os_kick.c b/src/core/os_kick.c
index ee256a463..af3d58496 100644
--- a/src/core/os_kick.c
+++ b/src/core/os_kick.c
@@ -6,8 +6,8 @@
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
- * Based on the original code of Services by Andy Church. 
- * 
+ * Based on the original code of Services by Andy Church.
+ *
  * $Id$
  *
  */
@@ -85,7 +85,7 @@ int do_os_kick(User * u)
         notice_lang(s_OperServ, u, OPER_BOUNCY_MODES_U_LINE);
         return MOD_CONT;
     }
-    anope_SendKick(s_OperServ, chan, nick, "%s (%s)", u->nick, s);
+    ircdproto->SendKick(s_OperServ, chan, nick, "%s (%s)", u->nick, s);
     if (WallOSKick)
         anope_SendGlobops(s_OperServ, "%s used KICK on %s/%s", u->nick,
                          nick, chan);