Argh, wrong replace caused by MS VS 2005 interface.

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

diff --git a/src/irc_dictionary.c b/src/irc_dictionary.c
index 2c901e9ab73d2882b0f76886f575ca685f679515..06b115a378aa234335e56b534cefbfe99b252807 100644 (file)
--- a/src/irc_dictionary.c
+++ b/src/irc_dictionary.c
@@ -24,12 +24,9 @@
 
 #include "stdinc.h"
 #include "sprintf_irc.h"
-#include "tools.h"
 #include "irc_string.h"
 #include "client.h"
-#include "memory.h"
 #include "setup.h"
-#include "balloc.h"
 #include "irc_dictionary.h"
 
 static BlockHeap *elem_heap = NULL;
@@ -471,7 +468,7 @@ void irc_dictionary_destroy(struct Dictionary *dtree,
 
        s_assert(dtree != NULL);
 
-       DLINK_FOREACH_SAFE(n, tn, dtree->head)
+       RB_DLINK_FOREACH_SAFE(n, tn, dtree->head)
        {
                if (destroy_cb != NULL)
                        (*destroy_cb)(n, privdata);
@@ -479,7 +476,7 @@ void irc_dictionary_destroy(struct Dictionary *dtree,
                BlockHeapFree(elem_heap, n);
        }
 
-       MyFree(dtree);
+       rb_free(dtree);
 }
 
 /*
@@ -508,7 +505,7 @@ void irc_dictionary_foreach(struct Dictionary *dtree,
 
        s_assert(dtree != NULL);
 
-       DLINK_FOREACH_SAFE(n, tn, dtree->head)
+       RB_DLINK_FOREACH_SAFE(n, tn, dtree->head)
        {
                /* delem_t is a subclass of node_t. */
                struct DictionaryElement *delem = (struct DictionaryElement *) n;
@@ -546,7 +543,7 @@ void *irc_dictionary_search(struct Dictionary *dtree,
 
        s_assert(dtree != NULL);
 
-       DLINK_FOREACH_SAFE(n, tn, dtree->head)
+       RB_DLINK_FOREACH_SAFE(n, tn, dtree->head)
        {
                /* delem_t is a subclass of node_t. */
                struct DictionaryElement *delem = (struct DictionaryElement *) n;