CurrentTime -> rb_currenttime();

[solanum.git] / src / s_newconf.c

diff --git a/src/s_newconf.c b/src/s_newconf.c
index 3c828b2751b0544199d793c606bbfe7117adfb53..061a9f65f9e53de4acff15b6ca54bd23cd58e2be 100644 (file)
--- a/src/s_newconf.c
+++ b/src/s_newconf.c
@@ -37,16 +37,12 @@
 #include "common.h"
 #include "s_conf.h"
 #include "s_newconf.h"
-#include "tools.h"
 #include "client.h"
-#include "memory.h"
 #include "s_serv.h"
 #include "send.h"
 #include "hostmask.h"
 #include "newconf.h"
 #include "hash.h"
-#include "balloc.h"
-#include "event.h"
 #include "sprintf_irc.h"
 #include "irc_dictionary.h"
 
@@ -157,7 +153,7 @@ clear_s_newconf_bans(void)
 struct remote_conf *
 make_remote_conf(void)
 {
-       struct remote_conf *remote_p = MyMalloc(sizeof(struct remote_conf));
+       struct remote_conf *remote_p = rb_malloc(sizeof(struct remote_conf));
        return remote_p;
 }
 
@@ -168,10 +164,10 @@ free_remote_conf(struct remote_conf *remote_p)
        if(remote_p == NULL)
                return;
 
-       MyFree(remote_p->username);
-       MyFree(remote_p->host);
-       MyFree(remote_p->server);
-       MyFree(remote_p);
+       rb_free(remote_p->username);
+       rb_free(remote_p->host);
+       rb_free(remote_p->server);
+       rb_free(remote_p);
 }
 
 int
@@ -250,7 +246,7 @@ cluster_generic(struct Client *source_p, const char *command,
 struct oper_conf *
 make_oper_conf(void)
 {
-       struct oper_conf *oper_p = MyMalloc(sizeof(struct oper_conf));
+       struct oper_conf *oper_p = rb_malloc(sizeof(struct oper_conf));
        return oper_p;
 }
 
@@ -261,24 +257,24 @@ free_oper_conf(struct oper_conf *oper_p)
        if(oper_p == NULL)
                return;
 
-       MyFree(oper_p->username);
-       MyFree(oper_p->host);
-       MyFree(oper_p->name);
+       rb_free(oper_p->username);
+       rb_free(oper_p->host);
+       rb_free(oper_p->name);
 
        if(oper_p->passwd)
        {
                memset(oper_p->passwd, 0, strlen(oper_p->passwd));
-               MyFree(oper_p->passwd);
+               rb_free(oper_p->passwd);
        }
 
 #ifdef HAVE_LIBCRYPTO
-       MyFree(oper_p->rsa_pubkey_file);
+       rb_free(oper_p->rsa_pubkey_file);
 
        if(oper_p->rsa_pubkey)
                RSA_free(oper_p->rsa_pubkey);
 #endif
 
-       MyFree(oper_p);
+       rb_free(oper_p);
 }
 
 struct oper_conf *
@@ -373,7 +369,7 @@ get_oper_privs(int flags)
 struct server_conf *
 make_server_conf(void)
 {
-       struct server_conf *server_p = MyMalloc(sizeof(struct server_conf));
+       struct server_conf *server_p = rb_malloc(sizeof(struct server_conf));
        server_p->aftype = AF_INET;
        return server_p;
 }
@@ -388,19 +384,19 @@ free_server_conf(struct server_conf *server_p)
        if(!EmptyString(server_p->passwd))
        {
                memset(server_p->passwd, 0, strlen(server_p->passwd));
-               MyFree(server_p->passwd);
+               rb_free(server_p->passwd);
        }
 
        if(!EmptyString(server_p->spasswd))
        {
                memset(server_p->spasswd, 0, strlen(server_p->spasswd));
-               MyFree(server_p->spasswd);
+               rb_free(server_p->spasswd);
        }
 
-       MyFree(server_p->name);
-       MyFree(server_p->host);
-       MyFree(server_p->class_name);
-       MyFree(server_p);
+       rb_free(server_p->name);
+       rb_free(server_p->host);
+       rb_free(server_p->class_name);
+       rb_free(server_p);
 }
 
 void
@@ -408,7 +404,7 @@ add_server_conf(struct server_conf *server_p)
 {
        if(EmptyString(server_p->class_name))
        {
-               DupString(server_p->class_name, "default");
+               server_p->class_name = rb_strdup("default");
                server_p->class = default_class;
                return;
        }
@@ -420,8 +416,8 @@ add_server_conf(struct server_conf *server_p)
                conf_report_error("Warning connect::class invalid for %s",
                                server_p->name);
 
-               MyFree(server_p->class_name);
-               DupString(server_p->class_name, "default");
+               rb_free(server_p->class_name);
+               server_p->class_name = rb_strdup("default");
        }
 
        if(strchr(server_p->host, '*') || strchr(server_p->host, '?'))
@@ -697,7 +693,7 @@ expire_temp_rxlines(void *unused)
        {
                aconf = ptr->data;
 
-               if(aconf->hold && aconf->hold <= CurrentTime)
+               if(aconf->hold && aconf->hold <= rb_current_time())
                {
                        if(ConfigFileEntry.tkline_expire_notices)
                                sendto_realops_snomask(SNO_GENERAL, L_ALL,
@@ -714,7 +710,7 @@ expire_temp_rxlines(void *unused)
        {
                aconf = ptr->data;
 
-               if(aconf->hold && aconf->hold <= CurrentTime)
+               if(aconf->hold && aconf->hold <= rb_current_time())
                {
                        if(ConfigFileEntry.tkline_expire_notices)
                                sendto_realops_snomask(SNO_GENERAL, L_ALL,
@@ -729,7 +725,7 @@ expire_temp_rxlines(void *unused)
        {
                aconf = ptr->data;
 
-               if(aconf->hold && aconf->hold <= CurrentTime)
+               if(aconf->hold && aconf->hold <= rb_current_time())
                {
                        if(ConfigFileEntry.tkline_expire_notices)
                                sendto_realops_snomask(SNO_GENERAL, L_ALL,
@@ -758,7 +754,7 @@ add_nd_entry(const char *name)
        nd = BlockHeapAlloc(nd_heap);
        
        strlcpy(nd->name, name, sizeof(nd->name));
-       nd->expire = CurrentTime + ConfigFileEntry.nick_delay;
+       nd->expire = rb_current_time() + ConfigFileEntry.nick_delay;
 
        /* this list is ordered */
        rb_dlinkAddTail(nd, &nd->lnode, &nd_list);
@@ -789,7 +785,7 @@ expire_nd_entries(void *unused)
                /* this list is ordered - we can stop when we hit the first
                 * entry that doesnt expire..
                 */
-               if(nd->expire > CurrentTime)
+               if(nd->expire > rb_current_time())
                        return;
 
                free_nd_entry(nd);
@@ -805,14 +801,14 @@ add_tgchange(const char *host)
        if(find_tgchange(host))
                return;
 
-       target = MyMalloc(sizeof(tgchange));
+       target = rb_malloc(sizeof(tgchange));
        pnode = make_and_lookup(tgchange_tree, host);
 
        pnode->data = target;
        target->pnode = pnode;
 
-       DupString(target->ip, host);
-       target->expiry = CurrentTime + (60*60*12);
+       target->ip = rb_strdup(host);
+       target->expiry = rb_current_time() + (60*60*12);
 
        rb_dlinkAdd(target, &target->node, &tgchange_list);
 }