Remove anope_cmd_privmsg2 (it's identical to anope_cmd_privmsg!)

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

13 files changed, 10 insertions, 69 deletions

diff --git a/src/ircd.c b/src/ircd.c
index 80c72cf65..12330437a 100644
--- a/src/ircd.c
+++ b/src/ircd.c
@@ -64,7 +64,6 @@ void initIrcdProto()
     ircdproto.ircd_cmd_notice = NULL;
     ircdproto.ircd_cmd_notice2 = NULL;
     ircdproto.ircd_cmd_privmsg = NULL;
-    ircdproto.ircd_cmd_privmsg2 = NULL;
     ircdproto.ircd_cmd_serv_notice = NULL;
     ircdproto.ircd_cmd_serv_privmsg = NULL;
     ircdproto.ircd_cmd_bot_chan_mode = NULL;
@@ -327,11 +326,6 @@ void anope_cmd_privmsg(const char *source, const char *dest, const char *fmt, ..
     ircdproto.ircd_cmd_privmsg(source, dest, buf);
 }
 
-void anope_cmd_privmsg2(const char *source, const char *dest, const char *msg)
-{
-    ircdproto.ircd_cmd_privmsg2(source, dest, msg);
-}
-
 void anope_cmd_serv_notice(const char *source, const char *dest, const char *msg)
 {
     ircdproto.ircd_cmd_serv_notice(source, dest, msg);
@@ -806,12 +800,6 @@ pmodule_cmd_privmsg(void (*func) (const char *source, const char *dest, const ch
 }
 
 void
-pmodule_cmd_privmsg2(void (*func) (const char *source, const char *dest, const char *msg))
-{
-    ircdproto.ircd_cmd_privmsg2 = func;
-}
-
-void
 pmodule_cmd_serv_notice(void (*func) (const char *source, const char *dest, const char *msg))
 {
     ircdproto.ircd_cmd_serv_notice = func;
diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c
index db66b6554..bd0b9f05e 100644
--- a/src/protocol/bahamut.c
+++ b/src/protocol/bahamut.c
@@ -1054,7 +1054,7 @@ void bahamut_cmd_notice(const char *source, const char *dest, const char *buf)
     }
 
     if (NSDefFlags & NI_MSG) {
-        bahamut_cmd_privmsg2(source, dest, buf);
+        bahamut_cmd_privmsg(source, dest, buf);
     } else {
         send_cmd(source, "NOTICE %s :%s", dest, buf);
     }
@@ -1074,11 +1074,6 @@ void bahamut_cmd_privmsg(const char *source, const char *dest, const char *buf)
     send_cmd(source, "PRIVMSG %s :%s", dest, buf);
 }
 
-void bahamut_cmd_privmsg2(const char *source, const char *dest, const char *msg)
-{
-    send_cmd(source, "PRIVMSG %s :%s", dest, msg);
-}
-
 void bahamut_cmd_serv_notice(const char *source, const char *dest, const char *msg)
 {
     send_cmd(source, "NOTICE $%s :%s", dest, msg);
@@ -1583,7 +1578,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_notice(bahamut_cmd_notice);
     pmodule_cmd_notice2(bahamut_cmd_notice2);
     pmodule_cmd_privmsg(bahamut_cmd_privmsg);
-    pmodule_cmd_privmsg2(bahamut_cmd_privmsg2);
     pmodule_cmd_serv_notice(bahamut_cmd_serv_notice);
     pmodule_cmd_serv_privmsg(bahamut_cmd_serv_privmsg);
     pmodule_cmd_bot_chan_mode(bahamut_cmd_bot_chan_mode);
diff --git a/src/protocol/bahamut.h b/src/protocol/bahamut.h
index 6c7c2850d..4194d376b 100644
--- a/src/protocol/bahamut.h
+++ b/src/protocol/bahamut.h
@@ -77,7 +77,6 @@ void bahamut_cmd_notice_ops(const char *source, const char *dest, const char *bu
 void bahamut_cmd_notice(const char *source, const char *dest, const char *buf);
 void bahamut_cmd_notice2(const char *source, const char *dest, const char *msg);
 void bahamut_cmd_privmsg(const char *source, const char *dest, const char *buf);
-void bahamut_cmd_privmsg2(const char *source, const char *dest, const char *msg);
 void bahamut_cmd_serv_notice(const char *source, const char *dest, const char *msg);
 void bahamut_cmd_serv_privmsg(const char *source, const char *dest, const char *msg);
 void bahamut_cmd_bot_chan_mode(const char *nick, const char *chan);
diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c
index 451b26fb6..3af3b2dd6 100644
--- a/src/protocol/charybdis.c
+++ b/src/protocol/charybdis.c
@@ -461,7 +461,7 @@ void charybdis_cmd_notice(const char *source, const char *dest, const char *buf)
     }
 
     if (NSDefFlags & NI_MSG) {
-        charybdis_cmd_privmsg2(source, dest, buf);
+        charybdis_cmd_privmsg(source, dest, buf);
     } else {
         ud = find_uid(source);
         u = finduser(dest);
@@ -496,17 +496,6 @@ void charybdis_cmd_privmsg(const char *source, const char *dest, const char *buf
              (UseTS6 ? (ud2 ? ud2->uid : dest) : dest), buf);
 }
 
-void charybdis_cmd_privmsg2(const char *source, const char *dest, const char *msg)
-{
-    Uid *ud, *ud2;
-
-    ud = find_uid(source);
-    ud2 = find_uid(dest);
-
-    send_cmd((UseTS6 ? (ud ? ud->uid : source) : source), "PRIVMSG %s :%s",
-             (UseTS6 ? (ud2 ? ud2->uid : dest) : dest), msg);
-}
-
 void charybdis_cmd_serv_notice(const char *source, const char *dest, const char *msg)
 {
     send_cmd(source, "NOTICE $$%s :%s", dest, msg);
@@ -1880,7 +1869,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_notice(charybdis_cmd_notice);
     pmodule_cmd_notice2(charybdis_cmd_notice2);
     pmodule_cmd_privmsg(charybdis_cmd_privmsg);
-    pmodule_cmd_privmsg2(charybdis_cmd_privmsg2);
     pmodule_cmd_serv_notice(charybdis_cmd_serv_notice);
     pmodule_cmd_serv_privmsg(charybdis_cmd_serv_privmsg);
     pmodule_cmd_bot_chan_mode(charybdis_cmd_bot_chan_mode);
diff --git a/src/protocol/charybdis.h b/src/protocol/charybdis.h
index 2f39a9e5d..6eb0c7232 100644
--- a/src/protocol/charybdis.h
+++ b/src/protocol/charybdis.h
@@ -65,7 +65,6 @@ void charybdis_cmd_notice_ops(const char *source, const char *dest, const char *
 void charybdis_cmd_notice(const char *source, const char *dest, const char *buf);
 void charybdis_cmd_notice2(const char *source, const char *dest, const char *msg);
 void charybdis_cmd_privmsg(const char *source, const char *dest, const char *buf);
-void charybdis_cmd_privmsg2(const char *source, const char *dest, const char *msg);
 void charybdis_cmd_serv_notice(const char *source, const char *dest, const char *msg);
 void charybdis_cmd_serv_privmsg(const char *source, const char *dest, const char *msg);
 void charybdis_cmd_bot_chan_mode(const char *nick, const char *chan);
diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c
index 32a87608a..183be0740 100644
--- a/src/protocol/inspircd11.c
+++ b/src/protocol/inspircd11.c
@@ -797,7 +797,7 @@ void inspircd_cmd_notice(const char *source, const char *dest, const char *buf)
     }
 
     if (NSDefFlags & NI_MSG) {
-        inspircd_cmd_privmsg2(source, dest, buf);
+        inspircd_cmd_privmsg(source, dest, buf);
     } else {
         send_cmd(source, "NOTICE %s :%s", dest, buf);
     }
@@ -817,11 +817,6 @@ void inspircd_cmd_privmsg(const char *source, const char *dest, const char *buf)
     send_cmd(source, "PRIVMSG %s :%s", dest, buf);
 }
 
-void inspircd_cmd_privmsg2(const char *source, const char *dest, const char *msg)
-{
-    send_cmd(source, "PRIVMSG %s :%s", dest, msg);
-}
-
 void inspircd_cmd_serv_notice(const char *source, const char *dest, const char *msg)
 {
     send_cmd(source, "NOTICE $%s :%s", dest, msg);
@@ -1818,7 +1813,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_notice(inspircd_cmd_notice);
     pmodule_cmd_notice2(inspircd_cmd_notice2);
     pmodule_cmd_privmsg(inspircd_cmd_privmsg);
-    pmodule_cmd_privmsg2(inspircd_cmd_privmsg2);
     pmodule_cmd_serv_notice(inspircd_cmd_serv_notice);
     pmodule_cmd_serv_privmsg(inspircd_cmd_serv_privmsg);
     pmodule_cmd_bot_chan_mode(inspircd_cmd_bot_chan_mode);
diff --git a/src/protocol/inspircd11.h b/src/protocol/inspircd11.h
index b6bf47268..517146414 100755
--- a/src/protocol/inspircd11.h
+++ b/src/protocol/inspircd11.h
@@ -70,7 +70,6 @@ void inspircd_cmd_notice_ops(const char *source, const char *dest, const char *b
 void inspircd_cmd_notice(const char *source, const char *dest, const char *buf);
 void inspircd_cmd_notice2(const char *source, const char *dest, const char *msg);
 void inspircd_cmd_privmsg(const char *source, const char *dest, const char *buf);
-void inspircd_cmd_privmsg2(const char *source, const char *dest, const char *msg);
 void inspircd_cmd_serv_notice(const char *source, const char *dest, const char *msg);
 void inspircd_cmd_serv_privmsg(const char *source, const char *dest, const char *msg);
 void inspircd_cmd_bot_chan_mode(const char *nick, const char *chan);
diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c
index 9f527732e..e6427b232 100644
--- a/src/protocol/ratbox.c
+++ b/src/protocol/ratbox.c
@@ -450,7 +450,7 @@ void ratbox_cmd_notice(const char *source, const char *dest, const char *buf)
     }
 
     if (NSDefFlags & NI_MSG) {
-        ratbox_cmd_privmsg2(source, dest, buf);
+        ratbox_cmd_privmsg(source, dest, buf);
     } else {
         ud = find_uid(source);
         u = finduser(dest);
@@ -485,17 +485,6 @@ void ratbox_cmd_privmsg(const char *source, const char *dest, const char *buf)
              (UseTS6 ? (ud2 ? ud2->uid : dest) : dest), buf);
 }
 
-void ratbox_cmd_privmsg2(const char *source, const char *dest, const char *msg)
-{
-    Uid *ud, *ud2;
-
-    ud = find_uid(source);
-    ud2 = find_uid(dest);
-
-    send_cmd((UseTS6 ? (ud ? ud->uid : source) : source), "PRIVMSG %s :%s",
-             (UseTS6 ? (ud2 ? ud2->uid : dest) : dest), msg);
-}
-
 void ratbox_cmd_serv_notice(const char *source, const char *dest, const char *msg)
 {
     send_cmd(source, "NOTICE $$%s :%s", dest, msg);
@@ -1776,7 +1765,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_notice(ratbox_cmd_notice);
     pmodule_cmd_notice2(ratbox_cmd_notice2);
     pmodule_cmd_privmsg(ratbox_cmd_privmsg);
-    pmodule_cmd_privmsg2(ratbox_cmd_privmsg2);
     pmodule_cmd_serv_notice(ratbox_cmd_serv_notice);
     pmodule_cmd_serv_privmsg(ratbox_cmd_serv_privmsg);
     pmodule_cmd_bot_chan_mode(ratbox_cmd_bot_chan_mode);
diff --git a/src/protocol/ratbox.h b/src/protocol/ratbox.h
index a94ee7105..8c6a42914 100644
--- a/src/protocol/ratbox.h
+++ b/src/protocol/ratbox.h
@@ -64,7 +64,6 @@ void ratbox_cmd_notice_ops(const char *source, const char *dest, const char *buf
 void ratbox_cmd_notice(const char *source, const char *dest, const char *buf);
 void ratbox_cmd_notice2(const char *source, const char *dest, const char *msg);
 void ratbox_cmd_privmsg(const char *source, const char *dest, const char *buf);
-void ratbox_cmd_privmsg2(const char *source, const char *dest, const char *msg);
 void ratbox_cmd_serv_notice(const char *source, const char *dest, const char *msg);
 void ratbox_cmd_serv_privmsg(const char *source, const char *dest, const char *msg);
 void ratbox_cmd_bot_chan_mode(const char *nick, const char *chan);
diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c
index cababc270..794b074d3 100644
--- a/src/protocol/unreal32.c
+++ b/src/protocol/unreal32.c
@@ -673,7 +673,7 @@ void unreal_cmd_notice(const char *source, const char *dest, const char *buf)
     }
 
     if (NSDefFlags & NI_MSG) {
-        unreal_cmd_privmsg2(source, dest, buf);
+        unreal_cmd_privmsg(source, dest, buf);
     } else {
         send_cmd(source, "%s %s :%s", send_token("NOTICE", "B"), dest,
                  buf);
@@ -694,11 +694,6 @@ void unreal_cmd_privmsg(const char *source, const char *dest, const char *buf)
     send_cmd(source, "%s %s :%s", send_token("PRIVMSG", "!"), dest, buf);
 }
 
-void unreal_cmd_privmsg2(const char *source, const char *dest, const char *msg)
-{
-    send_cmd(source, "%s %s :%s", send_token("PRIVMSG", "!"), dest, msg);
-}
-
 void unreal_cmd_serv_notice(const char *source, const char *dest, const char *msg)
 {
     send_cmd(source, "%s $%s :%s", send_token("NOTICE", "B"), dest, msg);
@@ -2136,7 +2131,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_notice(unreal_cmd_notice);
     pmodule_cmd_notice2(unreal_cmd_notice2);
     pmodule_cmd_privmsg(unreal_cmd_privmsg);
-    pmodule_cmd_privmsg2(unreal_cmd_privmsg2);
     pmodule_cmd_serv_notice(unreal_cmd_serv_notice);
     pmodule_cmd_serv_privmsg(unreal_cmd_serv_privmsg);
     pmodule_cmd_bot_chan_mode(unreal_cmd_bot_chan_mode);
diff --git a/src/protocol/unreal32.h b/src/protocol/unreal32.h
index e36a4b86e..d45b428b9 100644
--- a/src/protocol/unreal32.h
+++ b/src/protocol/unreal32.h
@@ -99,7 +99,6 @@ void unreal_cmd_notice_ops(const char *source, const char *dest, const char *buf
 void unreal_cmd_notice(const char *source, const char *dest, const char *buf);
 void unreal_cmd_notice2(const char *source, const char *dest, const char *msg);
 void unreal_cmd_privmsg(const char *source, const char *dest, const char *buf);
-void unreal_cmd_privmsg2(const char *source, const char *dest, const char *msg);
 void unreal_cmd_serv_notice(const char *source, const char *dest, const char *msg);
 void unreal_cmd_serv_privmsg(const char *source, const char *dest, const char *msg);
 void unreal_cmd_bot_chan_mode(const char *nick, const char *chan);
diff --git a/src/send.c b/src/send.c
index accf6a680..a63624234 100644
--- a/src/send.c
+++ b/src/send.c
@@ -172,7 +172,7 @@ void notice_lang(const char *source, User * dest, int message, ...)
         if (UsePrivmsg && ((!dest->na && (NSDefFlags & NI_MSG))
                            || (dest->na
                                && (dest->na->nc->flags & NI_MSG)))) {
-            anope_cmd_privmsg2(source, dest->nick, *t ? t : " ");
+            anope_cmd_privmsg(source, dest->nick, *t ? t : " ");
         } else {
             anope_cmd_notice2(source, dest->nick, *t ? t : " ");
         }
@@ -228,7 +228,7 @@ void notice_help(const char *source, User * dest, int message, ...)
         if (UsePrivmsg && ((!dest->na && (NSDefFlags & NI_MSG))
                            || (dest->na
                                && (dest->na->nc->flags & NI_MSG)))) {
-            anope_cmd_privmsg2(source, dest->nick, *outbuf ? outbuf : " ");
+            anope_cmd_privmsg(source, dest->nick, *outbuf ? outbuf : " ");
         } else {
             anope_cmd_notice2(source, dest->nick, *outbuf ? outbuf : " ");
         }
@@ -257,7 +257,7 @@ void notice(char *source, const char *dest, const char *fmt, ...)
         vsnprintf(buf, BUFSIZE - 1, fmt, args);
 
         if (NSDefFlags & NI_MSG) {
-            anope_cmd_privmsg2(source, dest, buf);
+            anope_cmd_privmsg(source, dest, buf);
         } else {
             anope_cmd_notice2(source, dest, buf);
         }
@@ -287,7 +287,7 @@ void privmsg(char *source, char *dest, const char *fmt, ...)
         va_end(args);
     }
 
-    anope_cmd_privmsg2(source, dest, buf);
+    anope_cmd_privmsg(source, dest, buf);
 }
 
 /*************************************************************************/
diff --git a/src/users.c b/src/users.c
index f69e5ef37..1bb02a5f2 100644
--- a/src/users.c
+++ b/src/users.c
@@ -287,7 +287,7 @@ void User::SendMessage(const char *source, const std::string &msg)
 	if (UsePrivmsg &&
 		((!this->na && NSDefFlags & NI_MSG) || (this->na && this->na->nc->flags & NI_MSG)))
 	{
-		anope_cmd_privmsg2(source, this->nick, msg.c_str());
+		anope_cmd_privmsg(source, this->nick, msg.c_str());
 	}
 	else
 	{