fixed syntax of last commit

diff --git a/ChanNode.c b/ChanNode.c
index 9bb9b313e465cde9cb708d401e2c26a6bfd42445..a1c2e1ff390cf952f8bb20db2ed49c1c0ee27bca 100644 (file)
--- a/ChanNode.c
+++ b/ChanNode.c
@@ -104,7 +104,7 @@ void delChannel(struct ChanNode* chan, int freeChan) {
         struct ChanUser *chanuser, *next;
         for(chanuser = getChannelUsers(chan, NULL); chanuser; chanuser = next) {
             next = getChannelUsers(chan, chanuser);
-            removeChanUserFromLists(chanUser, 0, 1, 1);
+            removeChanUserFromLists(chanuser, 0, 1, 1);
         }
     }
     if(freeChan)
@@ -114,7 +114,7 @@ void delChannel(struct ChanNode* chan, int freeChan) {
 }
 
 void checkChannelVisibility(struct ChanNode* chan) {
-    struct ChanUser *chanuser, *cchanuser, *next, *last = NULL;
+    struct ChanUser *chanuser, *next;
     for(chanuser = getChannelUsers(chan, NULL); chanuser; chanuser = getChannelUsers(chan, chanuser)) {
         if(chanuser->user->flags & USERFLAG_ISBOT) return;
     }
@@ -122,7 +122,7 @@ void checkChannelVisibility(struct ChanNode* chan) {
     for(chanuser = getChannelUsers(chan, NULL); chanuser; chanuser = next) {
         next = getChannelUsers(chan, chanuser);
         //remove the channel from the user's channel-list
-        removeChanUserFromLists(chanUser, 0, 1, 0);
+        removeChanUserFromLists(chanuser, 0, 1, 0);
         if(!chanuser->user->channel) {
             //free the user (no more channels)
             delUser(chanuser->user, 1);

diff --git a/ChanNode.h b/ChanNode.h
index 71769f3e51976bcab62eba745150c4eb36c604ce..8d1ed34e6aeee1f6b1bda8774059b6e7ae250013 100644 (file)
--- a/ChanNode.h
+++ b/ChanNode.h
@@ -20,5 +20,6 @@ int is_valid_chan(const char *name);
 struct ChanNode* getChanByName(const char *name);
 struct ChanNode* addChannel(const char *chan);
 void delChannel(struct ChanNode* chan, int freeChan);
+void checkChannelVisibility(struct ChanNode* chan);
 
 #endif
\ No newline at end of file

diff --git a/ChanUser.c b/ChanUser.c
index 7366c83be0b7e83ce8f4ce5e64b07f90aa0ca3f1..83324c4342d1f93ee26bc51477807df5f12f703e 100644 (file)
--- a/ChanUser.c
+++ b/ChanUser.c
@@ -90,7 +90,7 @@ void delChanUser(struct ChanUser *chanuser, int freeChanUser) {
     }
 }
 
-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 freeChanUser) {
     struct ChanUser *cchanuser, *last;
     if(remove_from_userlist) {
         //remove it from the channel's user-list

diff --git a/ChanUser.h b/ChanUser.h
index 8429a3a74cf51e5ee3e2026d05999ccd5c9a2992..f979893db5609efb31a0dfcfb6f9a71b9b0a8ff7 100644 (file)
--- a/ChanUser.h
+++ b/ChanUser.h
@@ -25,6 +25,6 @@ struct ChanUser* getChanUser(struct UserNode *user, struct ChanNode *chan);
 struct ChanUser* getChannelUsers(struct ChanNode *chan, struct ChanUser *last);
 struct ChanUser* getUserChannels(struct UserNode *user, struct ChanUser *last);
 void delChanUser(struct ChanUser *chanuser, int freeChanUser);
-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 freeChanUser);
 
 #endif
\ No newline at end of file

diff --git a/UserNode.c b/UserNode.c
index 870f11e3ce33939472c98bd687a3e5b992ea282e..1c223acbe15480d1c96947b801e0df3e87b2eb07 100644 (file)
--- a/UserNode.c
+++ b/UserNode.c
@@ -145,13 +145,13 @@ struct UserNode* createTempUser(const char *mask) {
     for(i = 0; i < strlen(mask)+1; i++) {
         if(cmask[i] == '!') {
             cmask[i] = 0;
-            struct UserNode *user = malloc(sizeof(*user));
+            user = malloc(sizeof(*user));
             if (!user)
             {
                 perror("malloc() failed");
                 return NULL;
             }
-            strcpy(user->nick, nick);
+            strcpy(user->nick, cmask);
             user->ident[0] = 0;
             user->host[0] = 0;
             user->realname[0] = 0;
@@ -160,7 +160,7 @@ struct UserNode* createTempUser(const char *mask) {
             ii = i+1;
         } else if(cmask[i] == '.' && !user) {
             //it's a server
-            struct UserNode *user = malloc(sizeof(*user));
+            user = malloc(sizeof(*user));
             if (!user)
             {
                 perror("malloc() failed");