mirrors/ngircd
1
0
Fork 0
mirror of https://github.com/osmarks/ngircd.git synced 2024-10-28 04:46:17 +00:00
Code Issues Releases Wiki Activity

Channel_Join(): Code cleanup.

Browse Source
This commit is contained in:
Alexander Barton 2008-07-22 13:07:57 +02:00
parent e37080400b
commit 477f2fd9e7
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/ngircd/channel.c
View File

@ -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 */