remove fd from io_event structure

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

diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c
index 976d2e0d0f1bcb6f81ab8d8461f4a230b11fbc7f..0c85a2938ea28960502a35757f1e7ab8e2304cf0 100644 (file)
--- a/src/ngircd/conf.c
+++ b/src/ngircd/conf.c
@@ -14,7 +14,7 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: conf.c,v 1.88 2005/10/11 19:29:23 alex Exp $";
+static char UNUSED id[] = "$Id: conf.c,v 1.91 2006/05/10 21:24:01 alex Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -86,7 +86,7 @@ strdup_warn(const char *str)
 static void
 ports_puts(array *a)
 {
-       unsigned int len;
+       size_t len;
        UINT16 *ports;
        len = array_length(a, sizeof(UINT16));
        if (len--) {
@@ -223,7 +223,7 @@ Conf_Test( void )
                puts( "[SERVER]" );
                printf( "  Name = %s\n", Conf_Server[i].name );
                printf( "  Host = %s\n", Conf_Server[i].host );
-               printf( "  Port = %d\n", Conf_Server[i].port );
+               printf( "  Port = %u\n", (unsigned int)Conf_Server[i].port );
                printf( "  MyPassword = %s\n", Conf_Server[i].pwd_in );
                printf( "  PeerPassword = %s\n", Conf_Server[i].pwd_out );
                printf( "  Group = %d\n\n", Conf_Server[i].group );
@@ -1013,6 +1013,7 @@ Config_Error_TooLong ( const int Line, const char *Item )
        Config_Error( LOG_WARNING, "%s, line %d: Value of \"%s\" too long!", NGIRCd_ConfFile, Line, Item );
 }
 
+
 static void
 Config_Error_NaN( const int Line, const char *Item )
 {
@@ -1020,6 +1021,7 @@ Config_Error_NaN( const int Line, const char *Item )
                                                NGIRCd_ConfFile, Line, Item );
 }
 
+
 #ifdef PROTOTYPES
 static void Config_Error( const int Level, const char *Format, ... )
 #else
@@ -1066,6 +1068,7 @@ Init_Server_Struct( CONF_SERVER *Server )
 
        if( NGIRCd_Passive ) Server->flags = CONF_SFLAG_DISABLED;
 
+       Resolve_Init(&Server->res_stat);
        Server->conn_id = NONE;
 } /* Init_Server_Struct */