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 1d6abd031183685b3015a3544b6673a96ed00862..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"
@@ -66,9 +61,9 @@ extern char linebuf[];
 
 static BlockHeap *confitem_heap = NULL;
 
-dlink_list temp_klines[LAST_TEMP_TYPE];
-dlink_list temp_dlines[LAST_TEMP_TYPE];
-dlink_list service_list;
+rb_dlink_list temp_klines[LAST_TEMP_TYPE];
+rb_dlink_list temp_dlines[LAST_TEMP_TYPE];
+rb_dlink_list service_list;
 
 /* internally defined functions */
 static void set_default_conf(void);
@@ -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);
 }
@@ -477,7 +472,7 @@ static int
 attach_iline(struct Client *client_p, struct ConfItem *aconf)
 {
        struct Client *target_p;
-       dlink_node *ptr;
+       rb_dlink_node *ptr;
        int local_count = 0;
        int global_count = 0;
        int ident_count = 0;
@@ -491,7 +486,7 @@ attach_iline(struct Client *client_p, struct ConfItem *aconf)
 
 
        /* find_hostname() returns the head of the list to search */
-       DLINK_FOREACH(ptr, find_hostname(client_p->host))
+       RB_DLINK_FOREACH(ptr, find_hostname(client_p->host))
        {
                target_p = ptr->data;
 
@@ -844,7 +839,7 @@ set_default_conf(void)
        ConfigFileEntry.reject_duration = 120;
        ConfigFileEntry.max_unknown_ip = 2;
 
-       ServerInfo.max_clients = comm_get_maxconnections() - MAX_BUFFER;
+       ServerInfo.max_clients = rb_get_maxconnections() - MAX_BUFFER;
 }
 
 #undef YES
@@ -942,22 +937,22 @@ add_temp_kline(struct ConfItem *aconf)
 {
        if(aconf->hold >= CurrentTime + (10080 * 60))
        {
-               dlinkAddAlloc(aconf, &temp_klines[TEMP_WEEK]);
+               rb_dlinkAddAlloc(aconf, &temp_klines[TEMP_WEEK]);
                aconf->port = TEMP_WEEK;
        }
        else if(aconf->hold >= CurrentTime + (1440 * 60))
        {
-               dlinkAddAlloc(aconf, &temp_klines[TEMP_DAY]);
+               rb_dlinkAddAlloc(aconf, &temp_klines[TEMP_DAY]);
                aconf->port = TEMP_DAY;
        }
        else if(aconf->hold >= CurrentTime + (60 * 60))
        {
-               dlinkAddAlloc(aconf, &temp_klines[TEMP_HOUR]);
+               rb_dlinkAddAlloc(aconf, &temp_klines[TEMP_HOUR]);
                aconf->port = TEMP_HOUR;
        }
        else
        {
-               dlinkAddAlloc(aconf, &temp_klines[TEMP_MIN]);
+               rb_dlinkAddAlloc(aconf, &temp_klines[TEMP_MIN]);
                aconf->port = TEMP_MIN;
        }
 
@@ -976,22 +971,22 @@ add_temp_dline(struct ConfItem *aconf)
 {
        if(aconf->hold >= CurrentTime + (10080 * 60))
        {
-               dlinkAddAlloc(aconf, &temp_dlines[TEMP_WEEK]);
+               rb_dlinkAddAlloc(aconf, &temp_dlines[TEMP_WEEK]);
                aconf->port = TEMP_WEEK;
        }
        else if(aconf->hold >= CurrentTime + (1440 * 60))
        {
-               dlinkAddAlloc(aconf, &temp_dlines[TEMP_DAY]);
+               rb_dlinkAddAlloc(aconf, &temp_dlines[TEMP_DAY]);
                aconf->port = TEMP_DAY;
        }
        else if(aconf->hold >= CurrentTime + (60 * 60))
        {
-               dlinkAddAlloc(aconf, &temp_dlines[TEMP_HOUR]);
+               rb_dlinkAddAlloc(aconf, &temp_dlines[TEMP_HOUR]);
                aconf->port = TEMP_HOUR;
        }
        else
        {
-               dlinkAddAlloc(aconf, &temp_dlines[TEMP_MIN]);
+               rb_dlinkAddAlloc(aconf, &temp_dlines[TEMP_MIN]);
                aconf->port = TEMP_MIN;
        }
 
@@ -1009,11 +1004,11 @@ add_temp_dline(struct ConfItem *aconf)
 static void
 expire_temp_kd(void *list)
 {
-       dlink_node *ptr;
-       dlink_node *next_ptr;
+       rb_dlink_node *ptr;
+       rb_dlink_node *next_ptr;
        struct ConfItem *aconf;
 
-       DLINK_FOREACH_SAFE(ptr, next_ptr, ((dlink_list *) list)->head)
+       RB_DLINK_FOREACH_SAFE(ptr, next_ptr, ((rb_dlink_list *) list)->head)
        {
                aconf = ptr->data;
 
@@ -1027,7 +1022,7 @@ expire_temp_kd(void *list)
                                                     user : "*", (aconf->host) ? aconf->host : "*");
 
                        delete_one_address_conf(aconf->host, aconf);
-                       dlinkDestroy(ptr, list);
+                       rb_dlinkDestroy(ptr, list);
                }
        }
 }
@@ -1036,15 +1031,15 @@ static void
 reorganise_temp_kd(void *list)
 {
        struct ConfItem *aconf;
-       dlink_node *ptr, *next_ptr;
+       rb_dlink_node *ptr, *next_ptr;
 
-       DLINK_FOREACH_SAFE(ptr, next_ptr, ((dlink_list *) list)->head)
+       RB_DLINK_FOREACH_SAFE(ptr, next_ptr, ((rb_dlink_list *) list)->head)
        {
                aconf = ptr->data;
 
                if(aconf->hold < (CurrentTime + (60 * 60)))
                {
-                       dlinkMoveNode(ptr, list, (aconf->status == CONF_KILL) ? 
+                       rb_dlinkMoveNode(ptr, list, (aconf->status == CONF_KILL) ? 
                                        &temp_klines[TEMP_MIN] : &temp_dlines[TEMP_MIN]);
                        aconf->port = TEMP_MIN;
                }
@@ -1052,14 +1047,14 @@ reorganise_temp_kd(void *list)
                {
                        if(aconf->hold < (CurrentTime + (1440 * 60)))
                        {
-                               dlinkMoveNode(ptr, list, (aconf->status == CONF_KILL) ? 
+                               rb_dlinkMoveNode(ptr, list, (aconf->status == CONF_KILL) ? 
                                                &temp_klines[TEMP_HOUR] : &temp_dlines[TEMP_HOUR]);
                                aconf->port = TEMP_HOUR;
                        }
                        else if(aconf->port > TEMP_DAY && 
                                (aconf->hold < (CurrentTime + (10080 * 60))))
                        {
-                               dlinkMoveNode(ptr, list, (aconf->status == CONF_KILL) ? 
+                               rb_dlinkMoveNode(ptr, list, (aconf->status == CONF_KILL) ? 
                                                &temp_klines[TEMP_DAY] : &temp_dlines[TEMP_DAY]);
                                aconf->port = TEMP_DAY;
                        }
@@ -1082,13 +1077,13 @@ get_oper_name(struct Client *client_p)
 
        if(MyOper(client_p))
        {
-               ircsnprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}",
+               rb_snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}",
                                client_p->name, client_p->username,
                                client_p->host, client_p->localClient->opername);
                return buffer;
        }
 
-       ircsnprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}",
+       rb_snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}",
                   client_p->name, client_p->username, 
                   client_p->host, client_p->servptr->name);
        return buffer;
@@ -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);
 }
 
 /*
@@ -1214,14 +1209,14 @@ static void
 clear_out_old_conf(void)
 {
        struct Class *cltmp;
-       dlink_node *ptr;
-       dlink_node *next_ptr;
+       rb_dlink_node *ptr;
+       rb_dlink_node *next_ptr;
 
        /*
         * don't delete the class table, rather mark all entries
         * for deletion. The table is cleaned up by check_class. - avalon
         */
-       DLINK_FOREACH(ptr, class_list.head)
+       RB_DLINK_FOREACH(ptr, class_list.head)
        {
                cltmp = ptr->data;
                MaxUsers(cltmp) = -1;
@@ -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,13 +1257,13 @@ clear_out_old_conf(void)
         */
 
        /* clean out general */
-       MyFree(ConfigFileEntry.servlink_path);
+       rb_free(ConfigFileEntry.servlink_path);
        ConfigFileEntry.servlink_path = NULL;
 
-       DLINK_FOREACH_SAFE(ptr, next_ptr, service_list.head)
+       RB_DLINK_FOREACH_SAFE(ptr, next_ptr, service_list.head)
        {
-               MyFree(ptr->data);
-               dlinkDestroy(ptr, &service_list);
+               rb_free(ptr->data);
+               rb_dlinkDestroy(ptr, &service_list);
        }
 
        /* remove any aliases... -- nenolod */
@@ -1379,20 +1374,20 @@ write_confitem(KlineType type, struct Client *source_p, char *user,
 
        if(type == KLINE_TYPE)
        {
-               ircsnprintf(buffer, sizeof(buffer),
+               rb_snprintf(buffer, sizeof(buffer),
                           "\"%s\",\"%s\",\"%s\",\"%s\",\"%s\",\"%s\",%ld\n",
                           user, host, reason, oper_reason, current_date,
                           get_oper_name(source_p), CurrentTime);
        }
        else if(type == DLINE_TYPE)
        {
-               ircsnprintf(buffer, sizeof(buffer),
+               rb_snprintf(buffer, sizeof(buffer),
                           "\"%s\",\"%s\",\"%s\",\"%s\",\"%s\",%ld\n", host,
                           reason, oper_reason, current_date, get_oper_name(source_p), CurrentTime);
        }
        else if(type == RESV_TYPE)
        {
-               ircsnprintf(buffer, sizeof(buffer), "\"%s\",\"%s\",\"%s\",%ld\n",
+               rb_snprintf(buffer, sizeof(buffer), "\"%s\",\"%s\",\"%s\",%ld\n",
                           host, reason, get_oper_name(source_p), CurrentTime);
        }
 
@@ -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;
        }