Argh, wrong replace caused by MS VS 2005 interface.

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

diff --git a/modules/m_rehash.c b/modules/m_rehash.c
index f0da6c183d2f10d93d3463174a2465008f4028a4..8e8771ce3fb67cbb0020c5fde1f700b3228dd093 100644 (file)
--- a/modules/m_rehash.c
+++ b/modules/m_rehash.c
@@ -108,17 +108,17 @@ static void
 rehash_glines(struct Client *source_p)
 {
        struct ConfItem *aconf;
-       dlink_node *ptr, *next_ptr;
+       rb_dlink_node *ptr, *next_ptr;
 
        sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s is clearing G-lines",
                                get_oper_name(source_p));
 
-       DLINK_FOREACH_SAFE(ptr, next_ptr, glines.head)
+       RB_DLINK_FOREACH_SAFE(ptr, next_ptr, glines.head)
        {
                aconf = ptr->data;
 
                delete_one_address_conf(aconf->host, aconf);
-               dlinkDestroy(ptr, &glines);
+               rb_dlinkDestroy(ptr, &glines);
        }
 }
 
@@ -126,20 +126,20 @@ static void
 rehash_pglines(struct Client *source_p)
 {
        struct gline_pending *glp_ptr;
-       dlink_node *ptr;
-       dlink_node *next_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));
 
-       DLINK_FOREACH_SAFE(ptr, next_ptr, pending_glines.head)
+       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);
+               rb_free(glp_ptr->reason1);
+               rb_free(glp_ptr->reason2);
+               rb_free(glp_ptr);
+               rb_dlinkDestroy(ptr, &pending_glines);
        }
 }
 
@@ -147,7 +147,7 @@ static void
 rehash_tklines(struct Client *source_p)
 {
        struct ConfItem *aconf;
-       dlink_node *ptr, *next_ptr;
+       rb_dlink_node *ptr, *next_ptr;
        int i;
 
        sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s is clearing temp klines",
@@ -155,12 +155,12 @@ rehash_tklines(struct Client *source_p)
 
        for(i = 0; i < LAST_TEMP_TYPE; i++)
        {
-               DLINK_FOREACH_SAFE(ptr, next_ptr, temp_klines[i].head)
+               RB_DLINK_FOREACH_SAFE(ptr, next_ptr, temp_klines[i].head)
                {
                        aconf = ptr->data;
 
                        delete_one_address_conf(aconf->host, aconf);
-                       dlinkDestroy(ptr, &temp_klines[i]);
+                       rb_dlinkDestroy(ptr, &temp_klines[i]);
                }
        }
 }
@@ -169,7 +169,7 @@ static void
 rehash_tdlines(struct Client *source_p)
 {
        struct ConfItem *aconf;
-       dlink_node *ptr, *next_ptr;
+       rb_dlink_node *ptr, *next_ptr;
        int i;
 
        sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s is clearing temp dlines",
@@ -177,12 +177,12 @@ rehash_tdlines(struct Client *source_p)
 
        for(i = 0; i < LAST_TEMP_TYPE; i++)
        {
-               DLINK_FOREACH_SAFE(ptr, next_ptr, temp_dlines[i].head)
+               RB_DLINK_FOREACH_SAFE(ptr, next_ptr, temp_dlines[i].head)
                {
                        aconf = ptr->data;
 
                        delete_one_address_conf(aconf->host, aconf);
-                       dlinkDestroy(ptr, &temp_dlines[i]);
+                       rb_dlinkDestroy(ptr, &temp_dlines[i]);
                }
        }
 }
@@ -191,13 +191,13 @@ static void
 rehash_txlines(struct Client *source_p)
 {
        struct ConfItem *aconf;
-       dlink_node *ptr;
-       dlink_node *next_ptr;
+       rb_dlink_node *ptr;
+       rb_dlink_node *next_ptr;
 
        sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s is clearing temp xlines",
                                get_oper_name(source_p));
 
-       DLINK_FOREACH_SAFE(ptr, next_ptr, xline_conf_list.head)
+       RB_DLINK_FOREACH_SAFE(ptr, next_ptr, xline_conf_list.head)
        {
                aconf = ptr->data;
 
@@ -205,7 +205,7 @@ rehash_txlines(struct Client *source_p)
                        continue;
 
                free_conf(aconf);
-               dlinkDestroy(ptr, &xline_conf_list);
+               rb_dlinkDestroy(ptr, &xline_conf_list);
        }
 }
 
@@ -213,8 +213,8 @@ static void
 rehash_tresvs(struct Client *source_p)
 {
        struct ConfItem *aconf;
-       dlink_node *ptr;
-       dlink_node *next_ptr;
+       rb_dlink_node *ptr;
+       rb_dlink_node *next_ptr;
        int i;
 
        sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s is clearing temp resvs",
@@ -228,11 +228,11 @@ rehash_tresvs(struct Client *source_p)
                        continue;
 
                free_conf(aconf);
-               dlinkDestroy(ptr, &resvTable[i]);
+               rb_dlinkDestroy(ptr, &resvTable[i]);
        }
        HASH_WALK_END
 
-       DLINK_FOREACH_SAFE(ptr, next_ptr, resv_conf_list.head)
+       RB_DLINK_FOREACH_SAFE(ptr, next_ptr, resv_conf_list.head)
        {
                aconf = ptr->data;
 
@@ -240,7 +240,7 @@ rehash_tresvs(struct Client *source_p)
                        continue;
 
                free_conf(aconf);
-               dlinkDestroy(ptr, &resv_conf_list);
+               rb_dlinkDestroy(ptr, &resv_conf_list);
        }
 }
 
@@ -266,14 +266,14 @@ static void
 rehash_nickdelay(struct Client *source_p)
 {
        struct nd_entry *nd;
-       dlink_node *ptr;
-       dlink_node *safe_ptr;
+       rb_dlink_node *ptr;
+       rb_dlink_node *safe_ptr;
 
        sendto_realops_snomask(SNO_GENERAL, L_ALL,
                             "%s is clearing the nick delay table",
                             get_oper_name(source_p));
 
-       DLINK_FOREACH_SAFE(ptr, safe_ptr, nd_list.head)
+       RB_DLINK_FOREACH_SAFE(ptr, safe_ptr, nd_list.head)
        {
                nd = ptr->data;