repo: ngircd
action: commit
revision: 
path_from: 
revision_from: e9e7fc33f15d7ead5f547ebdfcc7836b75f54f83:
path_to: 
revision_to: 

commit e9e7fc33f15d7ead5f547ebdfcc7836b75f54f83
Author: Florian Westphal 
Date:   Sat Mar 7 00:13:25 2009 +0100

    add and use Channel_IsModeless()

    avoid "name[0] == '+'" where possible, having Channel_IsModeless()
    makes things much more obvious.

diff --git a/src/ngircd/channel.h b/src/ngircd/channel.h

--- a/src/ngircd/channel.h
+++ b/src/ngircd/channel.h
@@ -132,7 +132,7 @@ GLOBAL bool Channel_CheckKey PARAMS((CHANNEL *Chan, CLIENT *Client,
 				     const char *Key));

 #define Channel_IsLocal(c) (Channel_Name(c)[0] == '&')
-
+#define Channel_IsModeless(c) (Channel_Name(c)[0] == '+')

 #endif

diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c

--- a/src/ngircd/irc-channel.c
+++ b/src/ngircd/irc-channel.c
@@ -303,7 +303,7 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req )
 		if (!chan) { /* channel is new; it has been created above */
 			chan = Channel_Search(channame);
 			assert(chan != NULL);
-			if (*channame == '+') { /* modeless channel... */
+			if (Channel_IsModeless(chan)) {
 				Channel_ModeAdd(chan, 't'); /* /TOPIC not allowed */
 				Channel_ModeAdd(chan, 'n'); /* no external msgs */
 			}
diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c

--- a/src/ngircd/irc-mode.c
+++ b/src/ngircd/irc-mode.c
@@ -290,8 +290,7 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel)
 	long l;
 	size_t len;

-	/* Are modes allowed on channel? */
-	if (Channel_Name(Channel)[0] == '+')
+	if (Channel_IsModeless(Channel))
 		return IRC_WriteStrClient(Client, ERR_NOCHANMODES_MSG,
 				Client_ID(Client), Channel_Name(Channel));

-----END OF PAGE-----