X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/a55e57248b809678d3ac3ac716972def07c2c493..90a3c35b295b07ebe3793bf5d3b882c3c1a5dc7c:/src/channel.c?ds=sidebyside

diff --git a/src/channel.c b/src/channel.c
index 33c6ed8..43fc1ff 100644
--- 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);
 	}