MyMalloc -> rb_malloc

[solanum.git] / src / s_serv.c

diff --git a/src/s_serv.c b/src/s_serv.c
index 167b77f82f0276fb452191f95d8770ceabe0146c..0571237fa6aa3a08da0926397272a87d22ce1add 100644 (file)
--- a/src/s_serv.c
+++ b/src/s_serv.c
@@ -30,12 +30,10 @@
 #include <openssl/rsa.h>
 #endif
 
-#include "tools.h"
 #include "s_serv.h"
 #include "class.h"
 #include "client.h"
 #include "common.h"
-#include "event.h"
 #include "hash.h"
 #include "irc_string.h"
 #include "sprintf_irc.h"
@@ -44,7 +42,6 @@
 #include "numeric.h"
 #include "packet.h"
 #include "res.h"
-#include "commio.h"
 #include "s_conf.h"
 #include "s_newconf.h"
 #include "s_log.h"
@@ -53,7 +50,6 @@
 #include "scache.h"
 #include "send.h"
 #include "client.h"
-#include "memory.h"
 #include "channel.h"           /* chcap_usage_counts stuff... */
 #include "hook.h"
 #include "msg.h"
@@ -218,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;
@@ -1020,7 +1016,7 @@ server_estab(struct Client *client_p)
        if(client_p->localClient->passwd)
        {
                memset(client_p->localClient->passwd, 0, strlen(client_p->localClient->passwd));
-               MyFree(client_p->localClient->passwd);
+               rb_free(client_p->localClient->passwd);
                client_p->localClient->passwd = NULL;
        }
 
@@ -1112,7 +1108,7 @@ server_estab(struct Client *client_p)
        if(client_p->localClient->fullcaps)
        {
                DupString(client_p->serv->fullcaps, client_p->localClient->fullcaps);
-               MyFree(client_p->localClient->fullcaps);
+               rb_free(client_p->localClient->fullcaps);
                client_p->localClient->fullcaps = NULL;
        }
 
@@ -1251,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))
        {