MyMalloc -> rb_malloc

[solanum.git] / modules / m_gline.c

diff --git a/modules/m_gline.c b/modules/m_gline.c
index e3c90c4cede76ca2df7e842dc61623633d244308..ad737a0726efe1f80975f8bb480ec8402eed80ac 100644 (file)
--- a/modules/m_gline.c
+++ b/modules/m_gline.c
@@ -25,7 +25,6 @@
  */
 
 #include "stdinc.h"
-#include "tools.h"
 #include "s_gline.h"
 #include "channel.h"
 #include "client.h"
@@ -36,7 +35,6 @@
 #include "ircd.h"
 #include "hostmask.h"
 #include "numeric.h"
-#include "commio.h"
 #include "s_conf.h"
 #include "s_newconf.h"
 #include "scache.h"
@@ -559,7 +557,7 @@ set_local_gline(struct Client *source_p, const char *user,
                        DupString(aconf->spasswd, oper_reason);
        }
 
-       ircsnprintf(buffer, sizeof(buffer), "%s (%s)", reason, current_date);
+       rb_snprintf(buffer, sizeof(buffer), "%s (%s)", reason, current_date);
 
        DupString(aconf->passwd, buffer);
        DupString(aconf->user, user);
@@ -662,7 +660,7 @@ majority_gline(struct Client *source_p, const char *user,
 
        /* no pending gline, create a new one */
        pending = (struct gline_pending *) 
-                           MyMalloc(sizeof(struct gline_pending));
+                           rb_malloc(sizeof(struct gline_pending));
 
        strlcpy(pending->oper_nick1, source_p->name,
                sizeof(pending->oper_nick1));
@@ -681,7 +679,7 @@ majority_gline(struct Client *source_p, const char *user,
        pending->last_gline_time = CurrentTime;
        pending->time_request1 = CurrentTime;
 
-       dlinkAddAlloc(pending, &pending_glines);
+       rb_dlinkAddAlloc(pending, &pending_glines);
 
        return NO;
 }
@@ -722,7 +720,7 @@ remove_temp_gline(const char *user, const char *host)
                                                (struct sockaddr *)&caddr, bits))
                        continue;
 
-               dlinkDestroy(ptr, &glines);
+               rb_dlinkDestroy(ptr, &glines);
                remove_reject_mask(aconf->user, aconf->host);
                delete_one_address_conf(aconf->host, aconf);
                return YES;