Merging s_newconf.c from nenolod and me

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

diff --git a/src/supported.c b/src/supported.c
index 9dd8395c91c41e9e8526329ed3305e384e876f47..001a19201b55787ee921ed9f5e98c86b9e33b2af 100644 (file)
--- a/src/supported.c
+++ b/src/supported.c
@@ -81,7 +81,6 @@
  */
 
 #include "stdinc.h"
-#include "tools.h"
 #include "client.h"
 #include "common.h"
 #include "numeric.h"
@@ -104,7 +103,7 @@ add_isupport(const char *name, const char *(*func)(const void *), const void *pa
 {
        struct isupportitem *item;
 
-       item = MyMalloc(sizeof(struct isupportitem));
+       item = rb_malloc(sizeof(struct isupportitem));
        item->name = name;
        item->func = func;
        item->param = param;
@@ -117,14 +116,14 @@ delete_isupport(const char *name)
        rb_dlink_node *ptr, *next_ptr;
        struct isupportitem *item;
 
-       DLINK_FOREACH_SAFE(ptr, next_ptr, isupportlist.head)
+       RB_DLINK_FOREACH_SAFE(ptr, next_ptr, isupportlist.head)
        {
                item = ptr->data;
 
                if (!strcmp(item->name, name))
                {
                        rb_dlinkDelete(ptr, &isupportlist);
-                       MyFree(item);
+                       rb_free(item);
                }
        }
 }
@@ -150,7 +149,7 @@ show_isupport(struct Client *client_p)
        extra_space += strlen(me.name) + 1 + strlen(form_str(RPL_ISUPPORT));
 
        nchars = extra_space, nparams = 0, buf[0] = '\0';
-       DLINK_FOREACH(ptr, isupportlist.head)
+       RB_DLINK_FOREACH(ptr, isupportlist.head)
        {
                item = ptr->data;
                value = (*item->func)(item->param);