From 477f2fd9e719d757ff3d6f3515f845c37e13e354 Mon Sep 17 00:00:00 2001 From: Alexander Barton Date: Tue, 22 Jul 2008 13:07:57 +0200 Subject: [PATCH] Channel_Join(): Code cleanup. --- src/ngircd/channel.c | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c index 937abecc..58766810 100644 --- a/src/ngircd/channel.c +++ b/src/ngircd/channel.c @@ -183,30 +183,34 @@ Channel_Join( CLIENT *Client, char *Name ) { CHANNEL *chan; - assert( Client != NULL ); - assert( Name != NULL ); + assert(Client != NULL); + assert(Name != NULL); /* Check that the channel name is valid */ - if( ! Channel_IsValidName( Name )) { - IRC_WriteStrClient( Client, ERR_NOSUCHCHANNEL_MSG, Client_ID( Client ), Name ); + if (! Channel_IsValidName(Name)) { + IRC_WriteStrClient(Client, ERR_NOSUCHCHANNEL_MSG, + Client_ID(Client), Name); return false; } - chan = Channel_Search( Name ); - if( chan ) { + chan = Channel_Search(Name); + if(chan) { /* Check if the client is already in the channel */ - if( Get_Cl2Chan( chan, Client )) return false; - } - else - { - /* If the specified channel doesn't exist, the channel is created */ - chan = Channel_Create( Name ); - if (!chan) return false; + if (Get_Cl2Chan(chan, Client)) + return false; + } else { + /* If the specified channel does not exist, the channel + * is now created */ + chan = Channel_Create(Name); + if (!chan) + return false; } /* Add user to Channel */ - if( ! Add_Client( chan, Client )) return false; - else return true; + if (! Add_Client(chan, Client)) + return false; + + return true; } /* Channel_Join */ -- 2.39.2