ok, trying to work on blockheap's stuff

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

diff --git a/src/s_serv.c b/src/s_serv.c
index 72e7925e6356a2e401cfab4cc706b9144afd0f85..cd3a90f17a2571a57e9fa65876c9ef6f2619099b 100644 (file)
--- a/src/s_serv.c
+++ b/src/s_serv.c
@@ -214,7 +214,7 @@ collect_zipstats(void *unused)
                        /* only bother if we haven't already got something queued... */
                        if(!target_p->localClient->slinkq)
                        {
-                               target_p->localClient->slinkq = MyMalloc(1);    /* sigh.. */
+                               target_p->localClient->slinkq = rb_malloc(1);   /* sigh.. */
                                target_p->localClient->slinkq[0] = SLINKCMD_ZIPSTATS;
                                target_p->localClient->slinkq_ofs = 0;
                                target_p->localClient->slinkq_len = 1;
@@ -370,7 +370,7 @@ try_connections(void *unused)
                 * made one successfull connection... [this algorithm is
                 * a bit fuzzy... -- msa >;) ]
                 */
-               if(tmp_p->hold > CurrentTime)
+               if(tmp_p->hold > rb_current_time())
                {
                        if(next > tmp_p->hold || next == 0)
                                next = tmp_p->hold;
@@ -378,7 +378,7 @@ try_connections(void *unused)
                }
 
                confrq = get_con_freq(cltmp);
-               tmp_p->hold = CurrentTime + confrq;
+               tmp_p->hold = rb_current_time() + confrq;
 
                /*
                 * Found a CONNECT config with port specified, scan clients
@@ -1079,7 +1079,7 @@ server_estab(struct Client *client_p)
                SetServlink(client_p);
        }
 
-       sendto_one(client_p, "SVINFO %d %d 0 :%ld", TS_CURRENT, TS_MIN, CurrentTime);
+       sendto_one(client_p, "SVINFO %d %d 0 :%ld", TS_CURRENT, TS_MIN, rb_current_time());
 
        client_p->servptr = &me;
 
@@ -1107,13 +1107,13 @@ server_estab(struct Client *client_p)
 
        if(client_p->localClient->fullcaps)
        {
-               DupString(client_p->serv->fullcaps, client_p->localClient->fullcaps);
+               client_p->serv->fullcaps = rb_strdup(client_p->localClient->fullcaps);
                rb_free(client_p->localClient->fullcaps);
                client_p->localClient->fullcaps = NULL;
        }
 
        client_p->serv->nameinfo = scache_connect(client_p->name, client_p->info, IsHidden(client_p));
-       client_p->localClient->firsttime = CurrentTime;
+       client_p->localClient->firsttime = rb_current_time();
        /* fixing eob timings.. -gnp */
 
        if((rb_dlink_list_length(&lclient_list) + rb_dlink_list_length(&serv_list)) >
@@ -1247,7 +1247,7 @@ start_io(struct Client *server)
        int linecount = 0;
        int linelen;
 
-       iobuf = MyMalloc(256);  /* XXX: This seems arbitrary. Perhaps make it IRCD_BUFSIZE? --nenolod */
+       iobuf = rb_malloc(256); /* XXX: This seems arbitrary. Perhaps make it IRCD_BUFSIZE? --nenolod */
 
        if(IsCapable(server, CAP_ZIP))
        {