ok, trying to work on blockheap's stuff

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

diff --git a/src/hostmask.c b/src/hostmask.c
index 9340d7e578cfd9afcf48f3e36e18d1edeb50d966..d00aeb7c48e7f2a76e54e486a725923e2ae79925 100644 (file)
--- a/src/hostmask.c
+++ b/src/hostmask.c
@@ -26,7 +26,6 @@
  */
 
 #include "stdinc.h"
-#include "memory.h"
 #include "ircd_defs.h"
 #include "s_conf.h"
 #include "hostmask.h"
@@ -447,7 +446,7 @@ find_exact_conf_by_address(const char *address, int type, const char *username)
 
        if(address == NULL)
                address = "/NOMATCH!/";
-       arec = MyMalloc(sizeof(struct AddressRec));
+       arec = rb_malloc(sizeof(struct AddressRec));
        masktype = parse_netmask(address, (struct sockaddr *)&addr, &bits);
 #ifdef IPV6
        if(masktype == HM_IPV6)
@@ -504,7 +503,7 @@ add_conf_by_address(const char *address, int type, const char *username, struct
 
        if(address == NULL)
                address = "/NOMATCH!/";
-       arec = MyMalloc(sizeof(struct AddressRec));
+       arec = rb_malloc(sizeof(struct AddressRec));
        masktype = parse_netmask(address, (struct sockaddr *)&arec->Mask.ipa.addr, &bits);
        arec->Mask.ipa.bits = bits;
        arec->masktype = masktype;
@@ -579,7 +578,7 @@ delete_one_address_conf(const char *address, struct ConfItem *aconf)
                        aconf->status |= CONF_ILLEGAL;
                        if(!aconf->clients)
                                free_conf(aconf);
-                       MyFree(arec);
+                       rb_free(arec);
                        return;
                }
                arecl = arec;
@@ -619,7 +618,7 @@ clear_out_address_conf(void)
                                arec->aconf->status |= CONF_ILLEGAL;
                                if(!arec->aconf->clients)
                                        free_conf(arec->aconf);
-                               MyFree(arec);
+                               rb_free(arec);
                        }
                }
                *store_next = NULL;
@@ -652,7 +651,7 @@ clear_out_address_conf_bans(void)
                                arec->aconf->status |= CONF_ILLEGAL;
                                if(!arec->aconf->clients)
                                        free_conf(arec->aconf);
-                               MyFree(arec);
+                               rb_free(arec);
                        }
                }
                *store_next = NULL;