Argh, wrong replace caused by MS VS 2005 interface.

[irc/rqf/shadowircd.git] / src / reject.c

diff --git a/src/reject.c b/src/reject.c
index ff35117972a8c97877fb8356bff3a3cbc66b7b36..aaf8fab009f54459953a1aa1489d33040e63c535 100644 (file)
--- a/src/reject.c
+++ b/src/reject.c
@@ -28,8 +28,6 @@
 #include "patricia.h"
 #include "client.h"
 #include "s_conf.h"
-#include "event.h"
-#include "tools.h"
 #include "reject.h"
 #include "s_stats.h"
 #include "msg.h"
@@ -57,7 +55,7 @@ reject_exit(void *unused)
        struct Client *client_p;
        rb_dlink_node *ptr, *ptr_next;
 
-       DLINK_FOREACH_SAFE(ptr, ptr_next, delay_exit.head)
+       RB_DLINK_FOREACH_SAFE(ptr, ptr_next, delay_exit.head)
        {
                client_p = ptr->data;
                if(IsDead(client_p))
@@ -95,7 +93,7 @@ reject_expires(void *unused)
        patricia_node_t *pnode;
        struct reject_data *rdata;
        
-       DLINK_FOREACH_SAFE(ptr, next, reject_list.head)
+       RB_DLINK_FOREACH_SAFE(ptr, next, reject_list.head)
        {
                pnode = ptr->data;
                rdata = pnode->data;            
@@ -104,7 +102,7 @@ reject_expires(void *unused)
                        continue;
 
                rb_dlinkDelete(ptr, &reject_list);
-               MyFree(rdata);
+               rb_free(rdata);
                patricia_remove(reject_tree, pnode);
        }
 }
@@ -196,12 +194,12 @@ flush_reject(void)
        patricia_node_t *pnode;
        struct reject_data *rdata;
        
-       DLINK_FOREACH_SAFE(ptr, next, reject_list.head)
+       RB_DLINK_FOREACH_SAFE(ptr, next, reject_list.head)
        {
                pnode = ptr->data;
                rdata = pnode->data;
                rb_dlinkDelete(ptr, &reject_list);
-               MyFree(rdata);
+               rb_free(rdata);
                patricia_remove(reject_tree, pnode);
        }
 }
@@ -220,7 +218,7 @@ remove_reject_ip(const char *ip)
        {
                struct reject_data *rdata = pnode->data;
                rb_dlinkDelete(&rdata->rnode, &reject_list);
-               MyFree(rdata);
+               rb_free(rdata);
                patricia_remove(reject_tree, pnode);
                return 1;
        }
@@ -241,14 +239,14 @@ remove_reject_mask(const char *mask1, const char *mask2)
                hashv ^= fnv_hash_upper(mask1, 32);
        if (mask2 != NULL)
                hashv ^= fnv_hash_upper(mask2, 32);
-       DLINK_FOREACH_SAFE(ptr, next, reject_list.head)
+       RB_DLINK_FOREACH_SAFE(ptr, next, reject_list.head)
        {
                pnode = ptr->data;
                rdata = pnode->data;
                if (rdata->mask_hashv == hashv)
                {
                        rb_dlinkDelete(ptr, &reject_list);
-                       MyFree(rdata);
+                       rb_free(rdata);
                        patricia_remove(reject_tree, pnode);
                        n++;
                }