X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/3e91d7006fc792367326ae5a259bde5f8aba89c3..90a3c35b295b07ebe3793bf5d3b882c3c1a5dc7c:/src/irc_dictionary.c

diff --git a/src/irc_dictionary.c b/src/irc_dictionary.c
index 2c901e9..06b115a 100644
--- 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;