Minor whitespace fixes.

[ngircd-alex.git] / src / ngircd / conf.h

diff --git a/src/ngircd/conf.h b/src/ngircd/conf.h
index 8c047699228582db28c09dc13e23b79cc348ad0c..9c38e08b4fa1fc7db22adfd5c727cf858b3a03eb 100644 (file)
--- a/src/ngircd/conf.h
+++ b/src/ngircd/conf.h
@@ -8,7 +8,7 @@
  * (at your option) any later version.
  * Please read the file COPYING, README and AUTHORS for more information.
  *
- * $Id: conf.h,v 1.33 2005/03/19 18:43:48 fw Exp $
+ * $Id: conf.h,v 1.38 2005/11/21 16:31:30 alex Exp $
  *
  * Configuration management (header)
  */
@@ -20,6 +20,7 @@
 #include <time.h>
 
 #include "defines.h"
+#include "array.h"
 #include "portab.h"
 
 typedef struct _Conf_Oper
@@ -48,7 +49,7 @@ typedef struct _Conf_Channel
 {
        char name[CHANNEL_NAME_LEN];    /* Name of the channel */
        char modes[CHANNEL_MODE_LEN];   /* Initial channel modes */
-       char topic[CHANNEL_TOPIC_LEN];  /* Initial topic */
+       array topic;                    /* Initial topic */
 } CONF_CHANNEL;
 
 
@@ -77,8 +78,7 @@ GLOBAL char Conf_MotdFile[FNAME_LEN];
 GLOBAL char Conf_MotdPhrase[LINE_LEN];
 
 /* Ports the server should listen on */
-GLOBAL unsigned int Conf_ListenPorts[MAX_LISTEN_PORTS];
-GLOBAL int Conf_ListenPorts_Count;
+GLOBAL array Conf_ListenPorts;
 
 /* Address to which the socket should be bound or empty (=all) */
 GLOBAL char Conf_ListenAddress[16];
@@ -102,14 +102,14 @@ GLOBAL int Conf_ConnectRetry;
 
 /* Operators */
 GLOBAL CONF_OPER Conf_Oper[MAX_OPERATORS];
-GLOBAL int Conf_Oper_Count;
+GLOBAL unsigned int Conf_Oper_Count;
 
 /* Servers */
 GLOBAL CONF_SERVER Conf_Server[MAX_SERVERS];
 
 /* Pre-defined channels */
 GLOBAL CONF_CHANNEL Conf_Channel[MAX_DEFCHANNELS];
-GLOBAL int Conf_Channel_Count;
+GLOBAL unsigned int Conf_Channel_Count;
 
 /* Are IRC operators allowed to always use MODE? */
 GLOBAL bool Conf_OperCanMode;
@@ -129,9 +129,9 @@ GLOBAL int Conf_MaxJoins;
 GLOBAL int Conf_MaxConnectionsIP;
 
 
-GLOBAL void Conf_Init PARAMS((void ));
-GLOBAL void Conf_Rehash PARAMS((void ));
-GLOBAL int Conf_Test PARAMS((void ));
+GLOBAL void Conf_Init PARAMS((void));
+GLOBAL void Conf_Rehash PARAMS((void));
+GLOBAL int Conf_Test PARAMS((void));
 
 GLOBAL void Conf_UnsetServer PARAMS(( CONN_ID Idx ));
 GLOBAL void Conf_SetServer PARAMS(( int ConfServer, CONN_ID Idx ));