- Besseres Logging, wenn malloc() fehl schlaegt.

[ngircd-alex.git] / src / ngircd / channel.c

diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c
index 66b075697853bac568d10d11602195e8420f5435..38dc4684acef6109138b7ccda346dc6240bf5e1b 100644 (file)
--- a/src/ngircd/channel.c
+++ b/src/ngircd/channel.c
@@ -9,7 +9,7 @@
  * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
  * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
  *
- * $Id: channel.c,v 1.26 2002/06/01 15:55:17 alex Exp $
+ * $Id: channel.c,v 1.28 2002/06/09 13:15:58 alex Exp $
  *
  * channel.c: Management der Channels
  */
@@ -36,6 +36,7 @@
 #include "resolve.h"
 #include "conf.h"
 #include "hash.h"
+#include "lists.h"
 #include "log.h"
 #include "messages.h"
 
@@ -63,14 +64,20 @@ LOCAL BOOLEAN Delete_Channel PARAMS(( CHANNEL *Chan ));
 GLOBAL VOID
 Channel_Init( VOID )
 {
-       CHANNEL *chan;
-       CHAR *c;
-       INT i;
-       
        My_Channels = NULL;
        My_Cl2Chan = NULL;
+} /* Channel_Init */
+
 
+GLOBAL VOID
+Channel_InitPredefined( VOID )
+{
        /* Vordefinierte persistente Channels erzeugen */
+
+       CHANNEL *chan;
+       CHAR *c;
+       INT i;
+       
        for( i = 0; i < Conf_Channel_Count; i++ )
        {
                /* Ist ein Name konfiguriert? */
@@ -98,7 +105,7 @@ Channel_Init( VOID )
                }
                else Log( LOG_ERR, "Can't create pre-defined channel \"%s\"!", Conf_Channel[i].name );
        }
-} /* Channel_Init */
+} /* Channel_InitPredefined */
 
 
 GLOBAL VOID
@@ -610,7 +617,7 @@ New_Chan( CHAR *Name )
        c = malloc( sizeof( CHANNEL ));
        if( ! c )
        {
-               Log( LOG_EMERG, "Can't allocate memory!" );
+               Log( LOG_EMERG, "Can't allocate memory! [New_Chan]" );
                return NULL;
        }
        c->next = NULL;
@@ -656,7 +663,7 @@ Add_Client( CHANNEL *Chan, CLIENT *Client )
        cl2chan = malloc( sizeof( CL2CHAN ));
        if( ! cl2chan )
        {
-               Log( LOG_EMERG, "Can't allocate memory!" );
+               Log( LOG_EMERG, "Can't allocate memory! [Add_Client]" );
                return NULL;
        }
        cl2chan->channel = Chan;
@@ -781,6 +788,9 @@ Delete_Channel( CHANNEL *Chan )
 
        Log( LOG_DEBUG, "Freed channel structure for \"%s\".", Chan->name );
 
+       /* Invite- und Ban-Lists aufraeumen */
+       Lists_DeleteChannel( chan );
+
        /* Neu verketten und freigeben */
        if( last_chan ) last_chan->next = chan->next;
        else My_Channels = chan->next;