Replaced anope_cmd_privmsg() and privmsg() with direct call to SendPrivmsg() in IRCDProto class.

Added SendPrivmsgInternal() function to IRCDProto class, now SendPrivmsg() is a stub to handle varargs.


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

3 files changed, 15 insertions, 15 deletions

diff --git a/src/core/bs_act.c b/src/core/bs_act.c
index ff33c9955..2cdf2e28b 100644
--- a/src/core/bs_act.c
+++ b/src/core/bs_act.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_act(User * u)
         anope_cmd_action(ci->bi->nick, ci->name, "%s", text);
         ci->bi->lastmsg = time(NULL);
         if (LogBot && LogChannel && logchan && !debug && findchan(LogChannel))
-            anope_cmd_privmsg(ci->bi->nick, LogChannel, "ACT %s %s %s",
+            ircdproto->SendPrivmsg(ci->bi->nick, LogChannel, "ACT %s %s %s",
                               u->nick, ci->name, text);
     }
     return MOD_CONT;
diff --git a/src/core/bs_fantasy_seen.c b/src/core/bs_fantasy_seen.c
index 5703d9e9a..486df3a8f 100644
--- a/src/core/bs_fantasy_seen.c
+++ b/src/core/bs_fantasy_seen.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$
  *
  */
@@ -77,12 +77,12 @@ int do_fantasy(int argc, char **argv)
             /* If we look for the bot */
             snprintf(buf, sizeof(buf), getstring(u->na, BOT_SEEN_BOT),
                      u->nick);
-            anope_cmd_privmsg(ci->bi->nick, ci->name, "%s", buf);
+            ircdproto->SendPrivmsg(ci->bi->nick, ci->name, "%s", buf);
         } else if (!(na = findnick(target)) || (na->status & NS_VERBOTEN)) {
             /* If the nick is not registered or forbidden */
             snprintf(buf, sizeof(buf), getstring(u->na, BOT_SEEN_UNKNOWN),
                      target);
-            anope_cmd_privmsg(ci->bi->nick, ci->name, "%s", buf);
+            ircdproto->SendPrivmsg(ci->bi->nick, ci->name, "%s", buf);
         } else if ((u2 = nc_on_chan(ci->c, na->nc))) {
             /* If the nick we're looking for is on the channel,
              * there are three possibilities: it's yourself,
@@ -100,7 +100,7 @@ int do_fantasy(int argc, char **argv)
                          getstring(u->na, BOT_SEEN_ON_CHANNEL_AS), target,
                          u2->nick);
 
-            anope_cmd_privmsg(ci->bi->nick, ci->name, "%s", buf);
+            ircdproto->SendPrivmsg(ci->bi->nick, ci->name, "%s", buf);
         } else if ((access = get_access_entry(na->nc, ci))) {
             /* User is on the access list but not present actually.
                Special case: if access->last_seen is 0 it's that we
@@ -116,7 +116,7 @@ int do_fantasy(int argc, char **argv)
                 snprintf(buf, sizeof(buf),
                          getstring(u->na, BOT_SEEN_NEVER), target);
             }
-            anope_cmd_privmsg(ci->bi->nick, ci->name, "%s", buf);
+            ircdproto->SendPrivmsg(ci->bi->nick, ci->name, "%s", buf);
         } else if (na->nc == ci->founder) {
             /* User is the founder of the channel */
             char durastr[192];
@@ -124,12 +124,12 @@ int do_fantasy(int argc, char **argv)
                      time(NULL) - na->last_seen);
             snprintf(buf, sizeof(buf), getstring(u->na, BOT_SEEN_ON),
                      target, durastr);
-            anope_cmd_privmsg(ci->bi->nick, ci->name, "%s", buf);
+            ircdproto->SendPrivmsg(ci->bi->nick, ci->name, "%s", buf);
         } else {
             /* All other cases */
             snprintf(buf, sizeof(buf), getstring(u->na, BOT_SEEN_UNKNOWN),
                      target);
-            anope_cmd_privmsg(ci->bi->nick, ci->name, "%s", buf);
+            ircdproto->SendPrivmsg(ci->bi->nick, ci->name, "%s", buf);
         }
         /* free myStrGetToken(ed) variable target (#851) */
         Anope_Free(target);
diff --git a/src/core/bs_say.c b/src/core/bs_say.c
index 06a9497ce..76f14ee76 100644
--- a/src/core/bs_say.c
+++ b/src/core/bs_say.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$
  *
  */
@@ -84,10 +84,10 @@ int do_say(User * u)
         notice_lang(s_BotServ, u, ACCESS_DENIED);
     else {
         if (text[0] != '\001') {
-            anope_cmd_privmsg(ci->bi->nick, ci->name, "%s", text);
+            ircdproto->SendPrivmsg(ci->bi->nick, ci->name, "%s", text);
             ci->bi->lastmsg = time(NULL);
 	        if (LogBot && LogChannel && logchan && !debug && findchan(LogChannel))
-                anope_cmd_privmsg(ci->bi->nick, LogChannel,
+                ircdproto->SendPrivmsg(ci->bi->nick, LogChannel,
                                   "SAY %s %s %s", u->nick, ci->name, text);
         } else {
             syntax_error(s_BotServ, u, "SAY", BOT_SAY_SYNTAX);