Message handlers should return void.

[solanum.git] / modules / m_rehash.c

diff --git a/modules/m_rehash.c b/modules/m_rehash.c
index 9d0af3dbab2c2524eada88ae8c906429a694f9b2..ee98377255d2788682d932fb068c8aa5b0d18552 100644 (file)
--- a/modules/m_rehash.c
+++ b/modules/m_rehash.c
@@ -44,17 +44,19 @@
 #include "rb_radixtree.h"
 #include "sslproc.h"
 
-static int mo_rehash(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
-static int me_rehash(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
 static const char rehash_desc[] =
        "Provides the REHASH command to reload configuration and other files";
 
+static void mo_rehash(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static void me_rehash(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+
 struct Message rehash_msgtab = {
        "REHASH", 0, 0, 0, 0,
        {mg_unreg, mg_not_oper, mg_ignore, mg_ignore, {me_rehash, 0}, {mo_rehash, 0}}
 };
 
 mapi_clist_av1 rehash_clist[] = { &rehash_msgtab, NULL };
+
 DECLARE_MODULE_AV2(rehash, NULL, NULL, rehash_clist, NULL, NULL, NULL, NULL, rehash_desc);
 
 struct hash_commands
@@ -355,7 +357,7 @@ do_rehash(struct Client *source_p, const char *type)
  * parv[1] = rehash type or destination
  * parv[2] = destination
  */
-static int
+static void
 mo_rehash(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
        const char *type = NULL, *target_server = NULL;
@@ -364,7 +366,7 @@ mo_rehash(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sourc
        {
                sendto_one(source_p, form_str(ERR_NOPRIVS),
                           me.name, source_p->name, "rehash");
-               return 0;
+               return;
        }
 
        if (parc > 2)
@@ -382,33 +384,29 @@ mo_rehash(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sourc
                {
                        sendto_one(source_p, form_str(ERR_NOPRIVS),
                                me.name, source_p->name, "remoteban");
-                       return 0;
+                       return;
                }
                sendto_match_servs(source_p, target_server,
                                CAP_ENCAP, NOCAPS,
                                "ENCAP %s REHASH %s",
                                target_server, type != NULL ? type : "");
                if (match(target_server, me.name) == 0)
-                       return 0;
+                       return;
        }
 
        do_rehash(source_p, type);
-
-       return 0;
 }
 
-static int
+static void
 me_rehash(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
 
        if (!IsPerson(source_p))
-               return 0;
+               return;
 
        if (!find_shared_conf(source_p->username, source_p->host,
                                source_p->servptr->name, SHARED_REHASH))
-               return 0;
+               return;
 
        do_rehash(source_p, parc > 1 ? parv[1] : NULL);
-
-       return 0;
 }