removed obsolete "int Conn_MaxFD"

This commit is contained in:
Florian Westphal 2006-02-02 21:00:21 +00:00
parent c8fb6a2258
commit 1249acfdba
2 changed files with 9 additions and 12 deletions

View File

@ -17,7 +17,7 @@
#include "portab.h" #include "portab.h"
#include "io.h" #include "io.h"
static char UNUSED id[] = "$Id: conn.c,v 1.186 2005/12/09 09:26:55 fw Exp $"; static char UNUSED id[] = "$Id: conn.c,v 1.187 2006/02/02 21:00:21 fw Exp $";
#include "imp.h" #include "imp.h"
#include <assert.h> #include <assert.h>
@ -228,9 +228,6 @@ Conn_Init( void )
array_free( &My_Listeners ); array_free( &My_Listeners );
/* Groesster File-Descriptor fuer select() */
Conn_MaxFD = 0;
/* Connection-Struktur initialisieren */ /* Connection-Struktur initialisieren */
for( i = 0; i < Pool_Size; i++ ) Init_Conn_Struct( i ); for( i = 0; i < Pool_Size; i++ ) Init_Conn_Struct( i );
@ -462,7 +459,9 @@ Conn_Handler( void )
#endif #endif
/* Should the configuration be reloaded? */ /* Should the configuration be reloaded? */
if( NGIRCd_SignalRehash ) NGIRCd_Rehash( ); if (NGIRCd_SignalRehash) {
NGIRCd_Rehash( );
}
/* Check configured servers and established links */ /* Check configured servers and established links */
Check_Servers( ); Check_Servers( );
@ -811,10 +810,10 @@ Conn_SyncServerStruct( void )
CONN_ID i; CONN_ID i;
int c; int c;
for( i = 0; i < Pool_Size; i++ ) for( i = 0; i < Pool_Size; i++ ) {
{
/* Established connection? */ /* Established connection? */
if( My_Connections[i].sock <= NONE ) continue; if (My_Connections[i].sock < 0)
continue;
/* Server connection? */ /* Server connection? */
client = Client_GetFromConn( i ); client = Client_GetFromConn( i );
@ -1616,7 +1615,7 @@ out:
n = Conf_GetServer( i ); n = Conf_GetServer( i );
assert(n > NONE ); assert(n > NONE );
if (n > NONE) { if (n > NONE) {
Conf_Server[n].conn_id = NONE; Conf_Server[n].conn_id = NONE;
Init_Conn_Struct(i); Init_Conn_Struct(i);
} }
} }

View File

@ -8,7 +8,7 @@
* (at your option) any later version. * (at your option) any later version.
* Please read the file COPYING, README and AUTHORS for more information. * Please read the file COPYING, README and AUTHORS for more information.
* *
* $Id: conn.h,v 1.39 2005/09/12 19:10:20 fw Exp $ * $Id: conn.h,v 1.40 2006/02/02 21:00:22 fw Exp $
* *
* Connection management (header) * Connection management (header)
*/ */
@ -93,8 +93,6 @@ GLOBAL void Conn_Close PARAMS(( CONN_ID Idx, char *LogMsg, char *FwdMsg, bool In
GLOBAL void Conn_SyncServerStruct PARAMS(( void )); GLOBAL void Conn_SyncServerStruct PARAMS(( void ));
GLOBAL int Conn_MaxFD;
#endif #endif