listener.c fixes - part 1

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

diff --git a/src/s_conf.c b/src/s_conf.c
index 3951baf909f9925e721a170b4a241574029174cb..f45601fc7536f8131f6634e7d975cbf70cdf76fa 100644 (file)
--- a/src/s_conf.c
+++ b/src/s_conf.c
@@ -59,7 +59,7 @@ extern char linebuf[];
 #define INADDR_NONE ((unsigned int) 0xffffffff)
 #endif
 
-static BlockHeap *confitem_heap = NULL;
+static rb_bh *confitem_heap = NULL;
 
 rb_dlink_list temp_klines[LAST_TEMP_TYPE];
 rb_dlink_list temp_dlines[LAST_TEMP_TYPE];
@@ -83,22 +83,22 @@ static int attach_iline(struct Client *, struct ConfItem *);
 void
 init_s_conf(void)
 {
-       confitem_heap = BlockHeapCreate(sizeof(struct ConfItem), CONFITEM_HEAP_SIZE);
+       confitem_heap = rb_bh_create(sizeof(struct ConfItem), CONFITEM_HEAP_SIZE);
 
-       eventAddIsh("expire_temp_klines", expire_temp_kd, &temp_klines[TEMP_MIN], 60);
-       eventAddIsh("expire_temp_dlines", expire_temp_kd, &temp_dlines[TEMP_MIN], 60);
+       rb_event_addish("expire_temp_klines", expire_temp_kd, &temp_klines[TEMP_MIN], 60);
+       rb_event_addish("expire_temp_dlines", expire_temp_kd, &temp_dlines[TEMP_MIN], 60);
 
-       eventAddIsh("expire_temp_klines_hour", reorganise_temp_kd,
+       rb_event_addish("expire_temp_klines_hour", reorganise_temp_kd,
                        &temp_klines[TEMP_HOUR], 3600);
-       eventAddIsh("expire_temp_dlines_hour", reorganise_temp_kd,
+       rb_event_addish("expire_temp_dlines_hour", reorganise_temp_kd,
                        &temp_dlines[TEMP_HOUR], 3600);
-       eventAddIsh("expire_temp_klines_day", reorganise_temp_kd,
+       rb_event_addish("expire_temp_klines_day", reorganise_temp_kd,
                        &temp_klines[TEMP_DAY], 86400);
-       eventAddIsh("expire_temp_dlines_day", reorganise_temp_kd,
+       rb_event_addish("expire_temp_dlines_day", reorganise_temp_kd,
                        &temp_dlines[TEMP_DAY], 86400);
-       eventAddIsh("expire_temp_klines_week", reorganise_temp_kd,
+       rb_event_addish("expire_temp_klines_week", reorganise_temp_kd,
                        &temp_klines[TEMP_WEEK], 604800);
-       eventAddIsh("expire_temp_dlines_week", reorganise_temp_kd,
+       rb_event_addish("expire_temp_dlines_week", reorganise_temp_kd,
                        &temp_dlines[TEMP_WEEK], 604800);
 }
 
@@ -114,7 +114,7 @@ make_conf()
 {
        struct ConfItem *aconf;
 
-       aconf = BlockHeapAlloc(confitem_heap);
+       aconf = rb_bh_alloc(confitem_heap);
        aconf->status = CONF_ILLEGAL;
        return (aconf);
 }
@@ -146,7 +146,7 @@ free_conf(struct ConfItem *aconf)
        rb_free(aconf->user);
        rb_free(aconf->host);
 
-       BlockHeapFree(confitem_heap, aconf);
+       rb_bh_free(confitem_heap, aconf);
 }
 
 /*