Cleanup warnings

[solanum.git] / modules / m_rehash.c

diff --git a/modules/m_rehash.c b/modules/m_rehash.c
index 603739d3dbb2dab75772f6103a87f64ddd35049b..2f0d8cf2f49acdc6a003cdd1f289d29dcdb73adf 100644 (file)
--- a/modules/m_rehash.c
+++ b/modules/m_rehash.c
@@ -41,11 +41,14 @@
 #include "reject.h"
 #include "hash.h"
 #include "cache.h"
-#include "irc_radixtree.h"
+#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,
@@ -53,7 +56,8 @@ struct Message rehash_msgtab = {
 };
 
 mapi_clist_av1 rehash_clist[] = { &rehash_msgtab, NULL };
-DECLARE_MODULE_AV1(rehash, NULL, NULL, rehash_clist, NULL, NULL, "$Revision: 3161 $");
+
+DECLARE_MODULE_AV2(rehash, NULL, NULL, rehash_clist, NULL, NULL, NULL, NULL, rehash_desc);
 
 struct hash_commands
 {
@@ -80,8 +84,7 @@ rehash_dns(struct Client *source_p)
        if (!MyConnect(source_p))
                remote_rehash_oper_p = source_p;
 
-       /* reread /etc/resolv.conf and reopen res socket */
-       restart_authd();
+       reload_nameservers();
 }
 
 static void
@@ -194,22 +197,21 @@ static void
 rehash_tresvs(struct Client *source_p)
 {
        struct ConfItem *aconf;
-       struct irc_radixtree_iteration_state iter;
+       struct rb_radixtree_iteration_state iter;
        rb_dlink_node *ptr;
        rb_dlink_node *next_ptr;
-       int i;
 
        sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s is clearing temp resvs",
                                get_oper_name(source_p));
        if (!MyConnect(source_p))
                remote_rehash_oper_p = source_p;
 
-       IRC_RADIXTREE_FOREACH(aconf, &iter, resv_tree)
+       RB_RADIXTREE_FOREACH(aconf, &iter, resv_tree)
        {
                if(!aconf->hold || aconf->lifetime)
                        continue;
 
-               irc_radixtree_delete(resv_tree, aconf->host);
+               rb_radixtree_delete(resv_tree, aconf->host);
                free_conf(aconf);
        }
 
@@ -353,7 +355,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;
@@ -362,7 +364,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)
@@ -380,33 +382,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;
 }