um_callerid: Use newer common channel iteration

[solanum.git] / modules / m_encap.c

diff --git a/modules/m_encap.c b/modules/m_encap.c
index 814953c4df4464bccf3e91d03f9558fe8539776b..f87ed65586815494041c0f0fa4590116027f8215 100644 (file)
--- a/modules/m_encap.c
+++ b/modules/m_encap.c
@@ -31,8 +31,7 @@
 #include "send.h"
 #include "channel.h"
 #include "client.h"
-#include "common.h"
-#include "config.h"
+#include "defaults.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_serv.h"
@@ -41,8 +40,10 @@
 #include "parse.h"
 #include "modules.h"
 
-static int ms_encap(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p,
-                    int parc, const char *parv[]);
+static const char encap_desc[] = "Provides the TS6 ENCAP facility";
+
+static void ms_encap(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p,
+               int parc, const char *parv[]);
 
 struct Message encap_msgtab = {
        "ENCAP", 0, 0, 0, 0,
@@ -50,7 +51,8 @@ struct Message encap_msgtab = {
 };
 
 mapi_clist_av1 encap_clist[] = { &encap_msgtab, NULL };
-DECLARE_MODULE_AV2(encap, NULL, NULL, encap_clist, NULL, NULL, NULL, NULL, NULL);
+
+DECLARE_MODULE_AV2(encap, NULL, NULL, encap_clist, NULL, NULL, NULL, NULL, encap_desc);
 
 /* ms_encap()
  *
@@ -58,7 +60,7 @@ DECLARE_MODULE_AV2(encap, NULL, NULL, encap_clist, NULL, NULL, NULL, NULL, NULL)
  * parv[2] - subcommand
  * parv[3] - parameters
  */
-static int
+static void
 ms_encap(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
        char buffer[BUFSIZE];
@@ -75,7 +77,7 @@ ms_encap(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source
 
                /* ugh, not even at the last parameter, just bail --fl */
                if((size_t)(cur_len + len) >= sizeof(buffer))
-                       return 0;
+                       return;
 
                snprintf(ptr, sizeof(buffer) - cur_len, "%s ", parv[i]);
                cur_len += len;
@@ -100,6 +102,4 @@ ms_encap(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source
        /* if it matches us, find a matching handler and call it */
        if(match(parv[1], me.name))
                handle_encap(msgbuf_p, client_p, source_p, parv[2], parc - 2, parv + 2);
-
-       return 0;
 }