Argh, wrong replace caused by MS VS 2005 interface.

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

diff --git a/src/channel.c b/src/channel.c
index 33c6ed888038e0e1c89bd7f740abde0459a6a27f..43fc1ffc864a23f689aaa60c380437547538fc93 100644 (file)
--- a/src/channel.c
+++ b/src/channel.c
@@ -96,7 +96,7 @@ allocate_channel(const char *chname)
 void
 free_channel(struct Channel *chptr)
 {
-       MyFree(chptr->chname);
+       rb_free(chptr->chname);
        BlockHeapFree(channel_heap, chptr);
 }
 
@@ -114,8 +114,8 @@ allocate_ban(const char *banstr, const char *who)
 void
 free_ban(struct Ban *bptr)
 {
-       MyFree(bptr->banstr);
-       MyFree(bptr->who);
+       rb_free(bptr->banstr);
+       rb_free(bptr->who);
        BlockHeapFree(ban_heap, bptr);
 }
 
@@ -264,12 +264,12 @@ remove_user_from_channels(struct Client *client_p)
        struct Channel *chptr;
        struct membership *msptr;
        rb_dlink_node *ptr;
-       rb_dlink_node *rb_free(;
+       rb_dlink_node *next_ptr;
 
        if(client_p == NULL)
                return;
 
-       RB_DLINK_FOREACH_SAFE(ptr, rb_free(, client_p->user->channel.head)
+       RB_DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->user->channel.head)
        {
                msptr = ptr->data;
                chptr = msptr->chptr;
@@ -347,10 +347,10 @@ void
 free_channel_list(rb_dlink_list * list)
 {
        rb_dlink_node *ptr;
-       rb_dlink_node *rb_free(;
+       rb_dlink_node *next_ptr;
        struct Ban *actualBan;
 
-       RB_DLINK_FOREACH_SAFE(ptr, rb_free(, list->head)
+       RB_DLINK_FOREACH_SAFE(ptr, next_ptr, list->head)
        {
                actualBan = ptr->data;
                free_ban(actualBan);
@@ -369,9 +369,9 @@ free_channel_list(rb_dlink_list * list)
 void
 destroy_channel(struct Channel *chptr)
 {
-       rb_dlink_node *ptr, *rb_free(;
+       rb_dlink_node *ptr, *next_ptr;
 
-       RB_DLINK_FOREACH_SAFE(ptr, rb_free(, chptr->invites.head)
+       RB_DLINK_FOREACH_SAFE(ptr, next_ptr, chptr->invites.head)
        {
                del_invite(chptr, ptr->data);
        }