Argh, wrong replace caused by MS VS 2005 interface.

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

diff --git a/src/s_conf.c b/src/s_conf.c
index 4694d4b06809b0b668184725ae23202093b07a5f..bed827cb43c6be9362e0501101abeeea0b343024 100644 (file)
--- a/src/s_conf.c
+++ b/src/s_conf.c
@@ -26,7 +26,6 @@
 
 #include "stdinc.h"
 #include "ircd_defs.h"
-#include "tools.h"
 #include "s_conf.h"
 #include "s_newconf.h"
 #include "s_serv.h"
@@ -35,7 +34,6 @@
 #include "class.h"
 #include "client.h"
 #include "common.h"
-#include "event.h"
 #include "hash.h"
 #include "irc_string.h"
 #include "sprintf_irc.h"
@@ -44,12 +42,9 @@
 #include "hostmask.h"
 #include "modules.h"
 #include "numeric.h"
-#include "commio.h"
 #include "s_log.h"
 #include "send.h"
 #include "s_gline.h"
-#include "memory.h"
-#include "balloc.h"
 #include "patricia.h"
 #include "reject.h"
 #include "cache.h"
@@ -144,12 +139,12 @@ free_conf(struct ConfItem *aconf)
        if(aconf->spasswd)
                memset(aconf->spasswd, 0, strlen(aconf->spasswd));
 
-       MyFree(aconf->passwd);
-       MyFree(aconf->spasswd);
-       MyFree(aconf->name);
-       MyFree(aconf->className);
-       MyFree(aconf->user);
-       MyFree(aconf->host);
+       rb_free(aconf->passwd);
+       rb_free(aconf->spasswd);
+       rb_free(aconf->name);
+       rb_free(aconf->className);
+       rb_free(aconf->user);
+       rb_free(aconf->host);
 
        BlockHeapFree(confitem_heap, aconf);
 }
@@ -1198,9 +1193,9 @@ free_alias_cb(struct DictionaryElement *ptr, void *unused)
 {
        struct alias_entry *aptr = ptr->data;
 
-       MyFree(aptr->name);
-       MyFree(aptr->target);
-       MyFree(aptr);
+       rb_free(aptr->name);
+       rb_free(aptr->target);
+       rb_free(aptr);
 }
 
 /*
@@ -1238,19 +1233,19 @@ clear_out_old_conf(void)
 #endif
 
        /* clean out ServerInfo */
-       MyFree(ServerInfo.description);
+       rb_free(ServerInfo.description);
        ServerInfo.description = NULL;
-       MyFree(ServerInfo.network_name);
+       rb_free(ServerInfo.network_name);
        ServerInfo.network_name = NULL;
-       MyFree(ServerInfo.network_desc);
+       rb_free(ServerInfo.network_desc);
        ServerInfo.network_desc = NULL;
 
        /* clean out AdminInfo */
-       MyFree(AdminInfo.name);
+       rb_free(AdminInfo.name);
        AdminInfo.name = NULL;
-       MyFree(AdminInfo.email);
+       rb_free(AdminInfo.email);
        AdminInfo.email = NULL;
-       MyFree(AdminInfo.description);
+       rb_free(AdminInfo.description);
        AdminInfo.description = NULL;
 
        /* operator{} and class{} blocks are freed above */
@@ -1262,12 +1257,12 @@ clear_out_old_conf(void)
         */
 
        /* clean out general */
-       MyFree(ConfigFileEntry.servlink_path);
+       rb_free(ConfigFileEntry.servlink_path);
        ConfigFileEntry.servlink_path = NULL;
 
        RB_DLINK_FOREACH_SAFE(ptr, next_ptr, service_list.head)
        {
-               MyFree(ptr->data);
+               rb_free(ptr->data);
                rb_dlinkDestroy(ptr, &service_list);
        }
 
@@ -1465,7 +1460,7 @@ conf_add_class_to_conf(struct ConfItem *aconf)
                                             aconf->className, aconf->user, aconf->host);
                }
 
-               MyFree(aconf->className);
+               rb_free(aconf->className);
                DupString(aconf->className, "default");
                return;
        }
@@ -1473,7 +1468,7 @@ conf_add_class_to_conf(struct ConfItem *aconf)
        if(ConfMaxUsers(aconf) < 0)
        {
                ClassPtr(aconf) = default_class;
-               MyFree(aconf->className);
+               rb_free(aconf->className);
                DupString(aconf->className, "default");
                return;
        }