/*
* ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2008 by Alexander Barton (alex@barton.de)
+ * Copyright (c)2001-2009 Alexander Barton (alex@barton.de)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
static bool Remove_Client PARAMS(( int Type, CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, const char *Reason, bool InformServer ));
static CL2CHAN *Get_First_Cl2Chan PARAMS(( CLIENT *Client, CHANNEL *Chan ));
static CL2CHAN *Get_Next_Cl2Chan PARAMS(( CL2CHAN *Start, CLIENT *Client, CHANNEL *Chan ));
-static bool Delete_Channel PARAMS(( CHANNEL *Chan ));
+static void Delete_Channel PARAMS(( CHANNEL *Chan ));
+static void Free_Channel PARAMS(( CHANNEL *Chan ));
GLOBAL void
{
/* Generate predefined persistent channels */
- CHANNEL *chan;
- char *c;
- unsigned int i;
+ CHANNEL *new_chan;
+ const struct Conf_Channel *conf_chan;
+ const char *c;
+ size_t i, channel_count = array_length(&Conf_Channels, sizeof(*conf_chan));
- for( i = 0; i < Conf_Channel_Count; i++ )
- {
- /* Check for Name configuration */
- if( ! Conf_Channel[i].name[0] ) continue;
+ conf_chan = array_start(&Conf_Channels);
- /* Check for invalid channel name */
- if( ! Channel_IsValidName( Conf_Channel[i].name ))
- {
- Log( LOG_ERR, "Can't create pre-defined channel: invalid name: \"%s\"!", Conf_Channel[i].name );
- array_free(&Conf_Channel[i].topic);
+ 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);
continue;
}
- /* Check if the channel name is already in use */
- chan = Channel_Search( Conf_Channel[i].name );
- if( chan )
- {
- Log( LOG_INFO, "Can't create pre-defined channel \"%s\": name already in use.", Conf_Channel[i].name );
- array_free(&Conf_Channel[i].topic);
+ new_chan = Channel_Search(conf_chan->name);
+ if (new_chan) {
+ Log(LOG_INFO, "Can't create pre-defined channel \"%s\": name already in use.",
+ conf_chan->name);
continue;
}
- /* Create channel */
- chan = Channel_Create(Conf_Channel[i].name);
- if (chan) {
- Channel_ModeAdd(chan, 'P');
+ new_chan = Channel_Create(conf_chan->name);
+ if (!new_chan) {
+ Log(LOG_ERR, "Can't create pre-defined channel \"%s\"",
+ conf_chan->name);
+ continue;
+ }
- if (array_start(&Conf_Channel[i].topic) != NULL)
- Channel_SetTopic(chan, NULL,
- array_start(&Conf_Channel[i].topic));
- array_free(&Conf_Channel[i].topic);
+ Channel_ModeAdd(new_chan, 'P');
- c = Conf_Channel[i].modes;
- while (*c)
- Channel_ModeAdd(chan, *c++);
+ if (conf_chan->topic[0])
+ Channel_SetTopic(new_chan, NULL, conf_chan->topic);
- Channel_SetKey(chan, Conf_Channel[i].key);
- Channel_SetMaxUsers(chan, Conf_Channel[i].maxusers);
+ c = conf_chan->modes;
+ while (*c)
+ Channel_ModeAdd(new_chan, *c++);
- Log(LOG_INFO, "Created pre-defined channel \"%s\".",
- Conf_Channel[i].name );
- }
- else Log(LOG_ERR, "Can't create pre-defined channel \"%s\"!",
- Conf_Channel[i].name );
+ Channel_SetKey(new_chan, conf_chan->key);
+ Channel_SetMaxUsers(new_chan, conf_chan->maxusers);
+ Log(LOG_INFO, "Created pre-defined channel \"%s\"",
+ conf_chan->name);
}
+ if (channel_count)
+ array_free(&Conf_Channels);
} /* Channel_InitPredefined */
+static void
+Free_Channel(CHANNEL *chan)
+{
+ array_free(&chan->topic);
+ Lists_Free(&chan->list_bans);
+ Lists_Free(&chan->list_invites);
+
+ free(chan);
+}
+
+
GLOBAL void
Channel_Exit( void )
{
/* free struct Channel */
c = My_Channels;
- while( c )
- {
+ while (c) {
c_next = c->next;
- array_free(&c->topic);
- free( c );
+ Free_Channel(c);
c = c_next;
}
/* Free Channel allocation table */
cl2chan = My_Cl2Chan;
- while( c )
- {
+ while (cl2chan) {
cl2chan_next = cl2chan->next;
- free( cl2chan );
+ free(cl2chan);
cl2chan = cl2chan_next;
}
} /* Channel_Exit */
} /* Get_Next_Cl2Chan */
-static bool
-Delete_Channel( CHANNEL *Chan )
+/**
+ * Remove a channel and free all of its data structures.
+ */
+static void
+Delete_Channel(CHANNEL *Chan)
{
- /* delete channel structure */
-
CHANNEL *chan, *last_chan;
last_chan = NULL;
chan = My_Channels;
- while( chan )
- {
- if( chan == Chan ) break;
+ while (chan) {
+ if (chan == Chan)
+ break;
last_chan = chan;
chan = chan->next;
}
- if( ! chan ) return false;
- Log( LOG_DEBUG, "Freed channel structure for \"%s\".", Chan->name );
-
- /* free invite and ban lists */
- Lists_Free( &chan->list_bans );
- Lists_Free( &chan->list_invites );
+ assert(chan != NULL);
+ if (!chan)
+ return;
/* maintain channel list */
- if( last_chan ) last_chan->next = chan->next;
- else My_Channels = chan->next;
- free( chan );
+ if (last_chan)
+ last_chan->next = chan->next;
+ else
+ My_Channels = chan->next;
- return true;
+ LogDebug("Freed channel structure for \"%s\".", Chan->name);
+ Free_Channel(Chan);
} /* Delete_Channel */
+
/* -eof- */