Reverting to 398.. trying again with native charybdis hash

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

diff --git a/src/hash.c b/src/hash.c
index 06beb69ad5d7f766a226fa9918b50a6671c4490d..41829bbe6c0f55aa62bae9f51575a0b28a2adb93 100644 (file)
--- a/src/hash.c
+++ b/src/hash.c
@@ -89,11 +89,11 @@ rb_dlink_list *hostTable;
 void
 init_hash(void)
 {
-       clientTable = MyMalloc(sizeof(rb_dlink_list) * U_MAX);
-       idTable = MyMalloc(sizeof(rb_dlink_list) * U_MAX);
-       channelTable = MyMalloc(sizeof(rb_dlink_list) * CH_MAX);
-       hostTable = MyMalloc(sizeof(rb_dlink_list) * HOST_MAX);
-       resvTable = MyMalloc(sizeof(rb_dlink_list) * R_MAX);
+       clientTable = rb_malloc(sizeof(rb_dlink_list) * U_MAX);
+       idTable = rb_malloc(sizeof(rb_dlink_list) * U_MAX);
+       channelTable = rb_malloc(sizeof(rb_dlink_list) * CH_MAX);
+       hostTable = rb_malloc(sizeof(rb_dlink_list) * HOST_MAX);
+       resvTable = rb_malloc(sizeof(rb_dlink_list) * R_MAX);
 }
 
 #ifndef RICER_HASHING
@@ -600,7 +600,7 @@ get_or_create_channel(struct Client *client_p, const char *chname, int *isnew)
 
        rb_dlinkAdd(chptr, &chptr->node, &global_channel_list);
 
-       chptr->channelts = CurrentTime; /* doesn't hurt to set it here */
+       chptr->channelts = rb_current_time();   /* doesn't hurt to set it here */
 
        rb_dlinkAddAlloc(chptr, &channelTable[hashv]);
 
@@ -643,10 +643,10 @@ clear_resv_hash(void)
 {
        struct ConfItem *aconf;
        rb_dlink_node *ptr;
-       rb_dlink_node *rb_free(;
+       rb_dlink_node *next_ptr;
        int i;
 
-       HASH_WALK_SAFE(i, R_MAX, ptr, rb_free(, resvTable)
+       HASH_WALK_SAFE(i, R_MAX, ptr, next_ptr, resvTable)
        {
                aconf = ptr->data;