Remove ^M on line endings.

[solanum.git] / modules / m_rehash.c

diff --git a/modules/m_rehash.c b/modules/m_rehash.c
index 1a88201e364d6e696b7c260fb232e1ab605935c9..60d5a187adbffc0f086f050cd3400e332f3dd707 100644 (file)
--- a/modules/m_rehash.c
+++ b/modules/m_rehash.c
@@ -30,13 +30,12 @@
 #include "common.h"
 #include "irc_string.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"
@@ -104,45 +103,6 @@ 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, *next_ptr;
-
-       sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s is clearing G-lines",
-                               get_oper_name(source_p));
-
-       RB_DLINK_FOREACH_SAFE(ptr, next_ptr, glines.head)
-       {
-               aconf = ptr->data;
-
-               delete_one_address_conf(aconf->host, aconf);
-               dlinkDestroy(ptr, &glines);
-       }
-}
-
-static void
-rehash_pglines(struct Client *source_p)
-{
-       struct gline_pending *glp_ptr;
-       rb_dlink_node *ptr;
-       rb_dlink_node *next_ptr;
-
-       sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s is clearing pending glines",
-                               get_oper_name(source_p));
-
-       RB_DLINK_FOREACH_SAFE(ptr, next_ptr, pending_glines.head)
-       {
-               glp_ptr = ptr->data;
-
-               MyFree(glp_ptr->reason1);
-               MyFree(glp_ptr->reason2);
-               MyFree(glp_ptr);
-               dlinkDestroy(ptr, &pending_glines);
-       }
-}
-
 static void
 rehash_tklines(struct Client *source_p)
 {
@@ -160,7 +120,7 @@ rehash_tklines(struct Client *source_p)
                        aconf = ptr->data;
 
                        delete_one_address_conf(aconf->host, aconf);
-                       dlinkDestroy(ptr, &temp_klines[i]);
+                       rb_dlinkDestroy(ptr, &temp_klines[i]);
                }
        }
 }
@@ -182,7 +142,7 @@ rehash_tdlines(struct Client *source_p)
                        aconf = ptr->data;
 
                        delete_one_address_conf(aconf->host, aconf);
-                       dlinkDestroy(ptr, &temp_dlines[i]);
+                       rb_dlinkDestroy(ptr, &temp_dlines[i]);
                }
        }
 }
@@ -205,7 +165,7 @@ rehash_txlines(struct Client *source_p)
                        continue;
 
                free_conf(aconf);
-               dlinkDestroy(ptr, &xline_conf_list);
+               rb_dlinkDestroy(ptr, &xline_conf_list);
        }
 }
 
@@ -228,7 +188,7 @@ rehash_tresvs(struct Client *source_p)
                        continue;
 
                free_conf(aconf);
-               dlinkDestroy(ptr, &resvTable[i]);
+               rb_dlinkDestroy(ptr, &resvTable[i]);
        }
        HASH_WALK_END
 
@@ -240,7 +200,7 @@ rehash_tresvs(struct Client *source_p)
                        continue;
 
                free_conf(aconf);
-               dlinkDestroy(ptr, &resv_conf_list);
+               rb_dlinkDestroy(ptr, &resv_conf_list);
        }
 }
 
@@ -288,8 +248,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          },