fixed last commits

[NeonServV5.git] / ChanUser.c

diff --git a/ChanUser.c b/ChanUser.c
index a4cf9de629daab860c5d3eef50eac04f92c05fe2..69fc006621744b3d91061f134c6560490e8c8817 100644 (file)
--- a/ChanUser.c
+++ b/ChanUser.c
@@ -10,11 +10,13 @@ struct ChanUser* addChanUser(struct ChanNode *chan, struct UserNode *user) {
         perror("malloc() failed");
         return NULL;
     }
+    chanuser->flags = 0;
     chanuser->user = user;
     chanuser->chan = chan;
 
     chanuser->next_user = chan->user;
     chan->user = chanuser;
+    chan->usercount++;
 
     chanuser->next_chan = user->channel;
     user->channel = chanuser;
@@ -73,6 +75,7 @@ void delChanUser(struct ChanUser *chanuser, int freeChanUser) {
     last = NULL;
     for(cchanuser = chanuser->chan->user; cchanuser; cchanuser = cchanuser->next_user) {
         if(cchanuser == chanuser) {
+            chanuser->chan->usercount--;
             if(last) 
                 last->next_user = chanuser->next_user;
             else
@@ -90,23 +93,41 @@ void delChanUser(struct ChanUser *chanuser, int freeChanUser) {
     }
 }
 
-void quitChanUser(struct ChanUser *chanuser, int freeChanUser) {
-    struct ChanUser *cchanuser, *last = NULL;
-    last = NULL;
-    for(cchanuser = chanuser->chan->user; cchanuser; cchanuser = cchanuser->next_user) {
-        if(cchanuser == chanuser) {
-            if(last) 
-                last->next_user = chanuser->next_user;
-            else
-                chanuser->chan->user = chanuser->next_user;
-            break;
-        } else
-            last = cchanuser;
+void removeChanUserFromLists(struct ChanUser *chanuser, int remove_from_userlist, int remove_from_channellist, int freeChanUser) {
+    struct ChanUser *cchanuser, *last;
+    if(remove_from_userlist) {
+        //remove it from the channel's user-list
+        last = NULL;
+        for(cchanuser = chanuser->chan->user; cchanuser; cchanuser = cchanuser->next_user) {
+            if(cchanuser == chanuser) {
+                chanuser->chan->usercount--;
+                if(last) 
+                    last->next_user = chanuser->next_user;
+                else
+                    chanuser->chan->user = chanuser->next_user;
+                break;
+            } else
+                last = cchanuser;
+        }
+        chanuser->next_user = NULL;
     }
-
+    if(remove_from_channellist) {
+        //remove it from the user's channel-list
+        last = NULL;
+        for(cchanuser = chanuser->user->channel; cchanuser; cchanuser = cchanuser->next_chan) {
+            if(cchanuser == chanuser) {
+                if(last) 
+                    last->next_chan = chanuser->next_chan;
+                else
+                    chanuser->user->channel = chanuser->next_chan;
+                break;
+            } else
+                last = cchanuser;
+        }
+        chanuser->next_chan = NULL;
+    }
+    
     if(freeChanUser)
         free(chanuser);
-    else
-        chanuser->next_user = NULL;
 }