*** VERSION 5.2.0 ***

[NeonServV5.git] / src / ChanUser.c

diff --git a/src/ChanUser.c b/src/ChanUser.c
index 05dbd88f0f609f63cde3a90a3d4367c422ec0c46..d683e22bd83e88c1468412fd2ff4e42e64f6e550 100644 (file)
--- a/src/ChanUser.c
+++ b/src/ChanUser.c
@@ -1,4 +1,4 @@
-/* ChanUser.c - NeonServ v5.1
+/* ChanUser.c - NeonServ v5.2
  * Copyright (C) 2011  Philipp Kreil (pk910)
  * 
  * This program is free software: you can redistribute it and/or modify
@@ -96,7 +96,7 @@ struct ChanUser* getUserChannels(struct UserNode *user, struct ChanUser *last) {
         return last->next_chan;
 }
 
-void delChanUser(struct ChanUser *chanuser, int freeChanUser) {
+void delChanUser(struct ChanUser *chanuser, int do_freeChanUser) {
     struct ChanUser *cchanuser, *last;
     //remove it from the user's channel-list
     if(!(chanuser->flags & CHANUSERFLAG_INVISIBLE)) {
@@ -127,17 +127,15 @@ void delChanUser(struct ChanUser *chanuser, int freeChanUser) {
             last = cchanuser;
     }
     
-    if(freeChanUser) {
-        if(chanuser->spamnode)
-            free(chanuser->spamnode);
-        free(chanuser);
+    if(do_freeChanUser) {
+        freeChanUser(chanuser);
     } else {
         chanuser->next_chan = NULL;
         chanuser->next_user = NULL;
     }
 }
 
-void removeChanUserFromLists(struct ChanUser *chanuser, int remove_from_userlist, int remove_from_channellist, int freeChanUser) {
+void removeChanUserFromLists(struct ChanUser *chanuser, int remove_from_userlist, int remove_from_channellist, int do_freeChanUser) {
     struct ChanUser *cchanuser, *last;
     if(remove_from_userlist) {
         //remove it from the channel's user-list
@@ -171,10 +169,14 @@ void removeChanUserFromLists(struct ChanUser *chanuser, int remove_from_userlist
         chanuser->next_chan = NULL;
     }
     
-    if(freeChanUser) {
-        if(chanuser->spamnode)
-            free(chanuser->spamnode);
-        free(chanuser);
+    if(do_freeChanUser) {
+        freeChanUser(chanuser);
     }
 }
 
+void freeChanUser(struct ChanUser *chanuser) {
+    if(chanuser->spamnode)
+        free(chanuser->spamnode);
+    free(chanuser);
+}
+