Update TODO

[irc/rqf/shadowircd.git] / modules / m_rehash.c

diff --git a/modules/m_rehash.c b/modules/m_rehash.c
index 18e28a27e286e55a7db62a6015a4cc8153e337d1..8bddf18ef4a14f716d7521ab9677d7384de89ae7 100644 (file)
--- a/modules/m_rehash.c
+++ b/modules/m_rehash.c
@@ -28,15 +28,14 @@
 #include "client.h"
 #include "channel.h"
 #include "common.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
-#include "s_gline.h"
 #include "s_serv.h"
 #include "numeric.h"
 #include "res.h"
 #include "s_conf.h"
 #include "s_newconf.h"
-#include "s_log.h"
+#include "logger.h"
 #include "send.h"
 #include "msg.h"
 #include "parse.h"
@@ -89,8 +88,7 @@ rehash_motd(struct Client *source_p)
                             "%s is forcing re-reading of MOTD file",
                             get_oper_name(source_p));
 
-       free_cachefile(user_motd);
-       user_motd = cache_file(MPATH, "ircd.motd", 0);
+       cache_user_motd();
 }
 
 static void
@@ -104,50 +102,11 @@ rehash_omotd(struct Client *source_p)
        oper_motd = cache_file(OPATH, "opers.motd", 0);
 }
 
-static void
-rehash_glines(struct Client *source_p)
-{
-       struct ConfItem *aconf;
-       rb_dlink_node *ptr, *rb_free(;
-
-       sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s is clearing G-lines",
-                               get_oper_name(source_p));
-
-       RB_DLINK_FOREACH_SAFE(ptr, rb_free(, glines.head)
-       {
-               aconf = ptr->data;
-
-               delete_one_address_conf(aconf->host, aconf);
-               rb_dlinkDestroy(ptr, &glines);
-       }
-}
-
-static void
-rehash_pglines(struct Client *source_p)
-{
-       struct gline_pending *glp_ptr;
-       rb_dlink_node *ptr;
-       rb_dlink_node *rb_free(;
-
-       sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s is clearing pending glines",
-                               get_oper_name(source_p));
-
-       RB_DLINK_FOREACH_SAFE(ptr, rb_free(, pending_glines.head)
-       {
-               glp_ptr = ptr->data;
-
-               MyFree(glp_ptr->reason1);
-               MyFree(glp_ptr->reason2);
-               MyFree(glp_ptr);
-               rb_dlinkDestroy(ptr, &pending_glines);
-       }
-}
-
 static void
 rehash_tklines(struct Client *source_p)
 {
        struct ConfItem *aconf;
-       rb_dlink_node *ptr, *rb_free(;
+       rb_dlink_node *ptr, *next_ptr;
        int i;
 
        sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s is clearing temp klines",
@@ -155,7 +114,7 @@ rehash_tklines(struct Client *source_p)
 
        for(i = 0; i < LAST_TEMP_TYPE; i++)
        {
-               RB_DLINK_FOREACH_SAFE(ptr, rb_free(, temp_klines[i].head)
+               RB_DLINK_FOREACH_SAFE(ptr, next_ptr, temp_klines[i].head)
                {
                        aconf = ptr->data;
 
@@ -169,7 +128,7 @@ static void
 rehash_tdlines(struct Client *source_p)
 {
        struct ConfItem *aconf;
-       rb_dlink_node *ptr, *rb_free(;
+       rb_dlink_node *ptr, *next_ptr;
        int i;
 
        sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s is clearing temp dlines",
@@ -177,7 +136,7 @@ rehash_tdlines(struct Client *source_p)
 
        for(i = 0; i < LAST_TEMP_TYPE; i++)
        {
-               RB_DLINK_FOREACH_SAFE(ptr, rb_free(, temp_dlines[i].head)
+               RB_DLINK_FOREACH_SAFE(ptr, next_ptr, temp_dlines[i].head)
                {
                        aconf = ptr->data;
 
@@ -192,12 +151,12 @@ rehash_txlines(struct Client *source_p)
 {
        struct ConfItem *aconf;
        rb_dlink_node *ptr;
-       rb_dlink_node *rb_free(;
+       rb_dlink_node *next_ptr;
 
        sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s is clearing temp xlines",
                                get_oper_name(source_p));
 
-       RB_DLINK_FOREACH_SAFE(ptr, rb_free(, xline_conf_list.head)
+       RB_DLINK_FOREACH_SAFE(ptr, next_ptr, xline_conf_list.head)
        {
                aconf = ptr->data;
 
@@ -214,13 +173,13 @@ rehash_tresvs(struct Client *source_p)
 {
        struct ConfItem *aconf;
        rb_dlink_node *ptr;
-       rb_dlink_node *rb_free(;
+       rb_dlink_node *next_ptr;
        int i;
 
        sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s is clearing temp resvs",
                                get_oper_name(source_p));
 
-       HASH_WALK_SAFE(i, R_MAX, ptr, rb_free(, resvTable)
+       HASH_WALK_SAFE(i, R_MAX, ptr, next_ptr, resvTable)
        {
                aconf = ptr->data;
 
@@ -232,7 +191,7 @@ rehash_tresvs(struct Client *source_p)
        }
        HASH_WALK_END
 
-       RB_DLINK_FOREACH_SAFE(ptr, rb_free(, resv_conf_list.head)
+       RB_DLINK_FOREACH_SAFE(ptr, next_ptr, resv_conf_list.head)
        {
                aconf = ptr->data;
 
@@ -288,8 +247,6 @@ static struct hash_commands rehash_commands[] =
        {"DNS",         rehash_dns              },
        {"MOTD",        rehash_motd             },
        {"OMOTD",       rehash_omotd            },
-       {"GLINES",      rehash_glines           },
-       {"PGLINES",     rehash_pglines          },
        {"TKLINES",     rehash_tklines          },
        {"TDLINES",     rehash_tdlines          },
        {"TXLINES",     rehash_txlines          },
@@ -328,8 +285,8 @@ do_rehash(struct Client *source_p, const char *type)
                for (x = 0; rehash_commands[x].cmd != NULL && rehash_commands[x].handler != NULL;
                     x++)
                {
-                       strlcat(cmdbuf, " ", sizeof(cmdbuf));
-                       strlcat(cmdbuf, rehash_commands[x].cmd, sizeof(cmdbuf));
+                       rb_strlcat(cmdbuf, " ", sizeof(cmdbuf));
+                       rb_strlcat(cmdbuf, rehash_commands[x].cmd, sizeof(cmdbuf));
                }
                sendto_one_notice(source_p, ":rehash one of:%s", cmdbuf);
        }