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 60b7e599535ae32ddd0e02dcfdbdd11a6da05457..001a19201b55787ee921ed9f5e98c86b9e33b2af 100644 (file)
--- a/src/supported.c
+++ b/src/supported.c
@@ -103,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;
@@ -113,17 +113,17 @@ add_isupport(const char *name, const char *(*func)(const void *), const void *pa
 void
 delete_isupport(const char *name)
 {
-       rb_dlink_node *ptr, *rb_free(;
+       rb_dlink_node *ptr, *next_ptr;
        struct isupportitem *item;
 
-       RB_DLINK_FOREACH_SAFE(ptr, rb_free(, 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);
                }
        }
 }