Automatic branch merge from 'origin/freenode/ircd-seven-merge-to-3.2' to 'trunk'.

[irc/rqf/shadowircd.git] / modules / m_xline.c

diff --git a/modules/m_xline.c b/modules/m_xline.c
index 954cee2f8a35b2a04314b56237991de7cf503a63..e1c5c9f5c362195f72b2e12d5c26dda99d3f15c2 100644 (file)
--- a/modules/m_xline.c
+++ b/modules/m_xline.c
@@ -42,8 +42,7 @@
 #include "logger.h"
 #include "s_serv.h"
 #include "whowas.h"
-#include "irc_string.h"
-#include "sprintf_irc.h"
+#include "match.h"
 #include "hash.h"
 #include "msg.h"
 #include "parse.h"
@@ -177,8 +176,8 @@ mo_xline(struct Client *client_p, struct Client *source_p, int parc, const char
 static int
 ms_xline(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
-       /* parv[0]  parv[1]      parv[2]  parv[3]  parv[4]
-        * oper     target serv  xline    type     reason
+       /* source_p  parv[1]      parv[2]  parv[3]  parv[4]
+        * oper      target serv  xline    type     reason
         */
        propagate_xline(source_p, parv[1], 0, parv[2], parv[3], parv[4]);
 
@@ -489,8 +488,8 @@ mo_unxline(struct Client *client_p, struct Client *source_p, int parc, const cha
 static int
 ms_unxline(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
-       /* parv[0]  parv[1]        parv[2]
-        * oper     target server  gecos
+       /* source_p  parv[1]        parv[2]
+        * oper      target server  gecos
         */
        propagate_generic(source_p, "UNXLINE", parv[1], CAP_CLUSTER,
                        "%s", parv[2]);