Remove s_assert definition from ircd_defs.h and add it to its own header.

[solanum.git] / extensions / m_omode.c

diff --git a/extensions/m_omode.c b/extensions/m_omode.c
index 3c33f167034d36be0e3f6a786b8ae08157ebadfe..418ed21484b9b6689e2bc4f4abe27bfc352a5a02 100644 (file)
--- a/extensions/m_omode.c
+++ b/extensions/m_omode.c
@@ -29,7 +29,7 @@
 #include "channel.h"
 #include "client.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_user.h"
@@ -41,6 +41,8 @@
 #include "parse.h"
 #include "modules.h"
 #include "packet.h"
+#include "messages.h"
+#include "logger.h"
 
 static int mo_omode(struct Client *, struct Client *, int, const char **);
 
@@ -55,7 +57,6 @@ DECLARE_MODULE_AV1(omode, NULL, NULL, omode_clist, NULL, NULL, "$Revision: 3121
 
 /*
  * mo_omode - MODE command handler
- * parv[0] - sender
  * parv[1] - channel
  */
 static int
@@ -105,8 +106,8 @@ mo_omode(struct Client *client_p, struct Client *source_p, int parc, const char
        for (i = 2; i < parc; i++)
        {
                if (i != 2)
-                       strlcat(params, " ", sizeof params);
-               strlcat(params, parv[i], sizeof params);
+                       rb_strlcat(params, " ", sizeof params);
+               rb_strlcat(params, parv[i], sizeof params);
        }
 
        sendto_wallops_flags(UMODE_WALLOP, &me, 
@@ -140,9 +141,6 @@ mo_omode(struct Client *client_p, struct Client *source_p, int parc, const char
                                ":%s TMODE %ld %s +o %s",
                                me.id, (long) chptr->channelts, parv[1],
                                source_p->id);
-               sendto_server(NULL, chptr, NOCAPS, CAP_TS6,
-                               ":%s MODE %s +o %s",
-                               me.name, parv[1], source_p->name);
                msptr->flags |= CHFL_CHANOP;
        }
        else