Message handlers should return void.

[solanum.git] / modules / m_cap.c

diff --git a/modules/m_cap.c b/modules/m_cap.c
index a8b68f5c751f6ae5ed7b9a69f9f03c3104c8793b..726fbe4a894e55db5d85f957aefbb2e322293cb2 100644 (file)
--- a/modules/m_cap.c
+++ b/modules/m_cap.c
@@ -44,9 +44,11 @@
 #include "s_conf.h"
 #include "hash.h"
 
+static const char cap_desc[] = "Provides the commands used for client capability negotiation";
+
 typedef int (*bqcmp)(const void *, const void *);
 
-static int m_cap(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static void m_cap(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
 
 struct Message cap_msgtab = {
        "CAP", 0, 0, 0, 0,
@@ -54,7 +56,8 @@ struct Message cap_msgtab = {
 };
 
 mapi_clist_av1 cap_clist[] = { &cap_msgtab, NULL };
-DECLARE_MODULE_AV2(cap, NULL, NULL, cap_clist, NULL, NULL, NULL, NULL, NULL);
+
+DECLARE_MODULE_AV2(cap, NULL, NULL, cap_clist, NULL, NULL, NULL, NULL, cap_desc);
 
 #define IsCapableEntry(c, e)           IsCapable(c, 1 << (e)->value)
 #define HasCapabilityFlag(c, f)                (c->ownerdata != NULL && (((struct ClientCapability *)c->ownerdata)->flags & (f)) == f)
@@ -414,7 +417,7 @@ clicap_cmd_search(const char *command, struct clicap_cmd *entry)
        return irccmp(command, entry->cmd);
 }
 
-static int
+static void
 m_cap(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
        struct clicap_cmd *cmd;
@@ -426,9 +429,8 @@ m_cap(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p,
                sendto_one(source_p, form_str(ERR_INVALIDCAPCMD),
                                me.name, EmptyString(source_p->name) ? "*" : source_p->name,
                                parv[1]);
-               return 0;
+               return;
        }
 
        (cmd->func)(source_p, parv[2]);
-       return 0;
 }