From 10cafa68a7d26d7a15c34b1a27516500c5a87080 Mon Sep 17 00:00:00 2001
From: pk910 <philipp@zoelle1.de>
Date: Thu, 11 Aug 2011 23:50:31 +0200
Subject: [PATCH] fixed syntax of last commit

---
 ChanNode.c | 6 +++---
 ChanNode.h | 1 +
 ChanUser.c | 2 +-
 ChanUser.h | 2 +-
 UserNode.c | 6 +++---
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/ChanNode.c b/ChanNode.c
index 9bb9b31..a1c2e1f 100644
--- 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 71769f3..8d1ed34 100644
--- 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 7366c83..83324c4 100644
--- 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 8429a3a..f979893 100644
--- 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 870f11e..1c223ac 100644
--- 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");
-- 
2.20.1