From e9f3e69f36ca64f8945677bc72ccb7bbb57842e1 Mon Sep 17 00:00:00 2001 From: Florian Westphal Date: Sat, 24 Sep 2005 02:20:00 +0000 Subject: [PATCH] use io_close instead of plain close in Conn_ExitListeners() --- src/ngircd/conn.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index 57bfb168..7be5d0a1 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -17,7 +17,7 @@ #include "portab.h" #include "io.h" -static char UNUSED id[] = "$Id: conn.c,v 1.181 2005/09/12 19:10:20 fw Exp $"; +static char UNUSED id[] = "$Id: conn.c,v 1.182 2005/09/24 02:20:00 fw Exp $"; #include "imp.h" #include @@ -320,23 +320,22 @@ Conn_ExitListeners( void ) { /* Close down all listening sockets */ int *fd; - unsigned int arraylen; + size_t arraylen; #ifdef ZEROCONF Rendezvous_UnregisterListeners( ); #endif arraylen = array_length(&My_Listeners, sizeof (int)); - Log( LOG_INFO, "Shutting down all listening sockets (%d)...", arraylen ); + Log( LOG_INFO, "Shutting down all listening sockets (%d total)...", arraylen ); + fd = array_start(&My_Listeners); while(arraylen--) { - fd = (int*) array_get(&My_Listeners, sizeof (int), arraylen); - if (fd) { - close(*fd); + assert(fd); + assert(*fd >= 0); + io_close(*fd); #ifdef DEBUG - Log( LOG_DEBUG, "Listening socket %d closed.", *fd ); - } else { - Log( LOG_DEBUG, "array_get pos %d returned NULL", arraylen ); + Log( LOG_DEBUG, "Listening socket %d closed.", *fd ); #endif - } + fd++; } array_free(&My_Listeners); } /* Conn_ExitListeners */ -- 2.39.2