about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorAlexander Barton <alex@barton.de>2011-12-04 22:30:32 +0100
committerAlexander Barton <alex@barton.de>2011-12-04 22:35:20 +0100
commit8fa92f0a24bb97a972ef82b8fa057d737c9f55b7 (patch)
treed190b271d02ad289040ecf3565073870d206dd9f /src
parent8e193df973bef0765754ccf4d6cb3ea21c226955 (diff)
downloadngircd-8fa92f0a24bb97a972ef82b8fa057d737c9f55b7.tar.gz
ngircd-8fa92f0a24bb97a972ef82b8fa057d737c9f55b7.zip
Suppress 'Can't create pre-defined channel: invalid name: ""' messages
Skip predefined channel structures that have configured no name,
like the "--configtest" does.
Diffstat (limited to 'src')
-rw-r--r--src/ngircd/channel.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c
index a36131c0..74c97a0a 100644
--- a/src/ngircd/channel.c
+++ b/src/ngircd/channel.c
@@ -110,9 +110,12 @@ Channel_InitPredefined( void )
 	assert(channel_count == 0 || conf_chan != NULL);
 
 	for (i = 0; i < channel_count; i++, conf_chan++) {
-		if (!conf_chan->name[0] || !Channel_IsValidName(conf_chan->name)) {
-			Log(LOG_ERR, "Can't create pre-defined channel: invalid name: \"%s\"",
-									conf_chan->name);
+		if (!conf_chan->name[0])
+			continue;
+		if (!Channel_IsValidName(conf_chan->name)) {
+			Log(LOG_ERR,
+			    "Can't create pre-defined channel: invalid name: \"%s\"",
+			    conf_chan->name);
 			continue;
 		}