Remove INT, LONG, BOOLEAN, STATIC, CONST, CHAR datatypes.

[ngircd.git] / src / ngircd / resolve.c

diff --git a/src/ngircd/resolve.c b/src/ngircd/resolve.c
index 36e16e56a9dad85a477f4f089acb9d263089c276..5b33acc405faf1118c38bd5393d4539dcc6a3045 100644 (file)
--- a/src/ngircd/resolve.c
+++ b/src/ngircd/resolve.c
@@ -14,7 +14,7 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: resolve.c,v 1.9 2004/05/11 00:01:11 alex Exp $";
+static char UNUSED id[] = "$Id: resolve.c,v 1.11 2005/03/19 18:43:49 fw Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -42,20 +42,22 @@ static char UNUSED id[] = "$Id: resolve.c,v 1.9 2004/05/11 00:01:11 alex Exp $";
 
 
 #ifdef IDENTAUTH
-LOCAL VOID Do_ResolveAddr PARAMS(( struct sockaddr_in *Addr, INT Sock, INT w_fd ));
+LOCAL void Do_ResolveAddr PARAMS(( struct sockaddr_in *Addr, int Sock, int w_fd ));
 #else
-LOCAL VOID Do_ResolveAddr PARAMS(( struct sockaddr_in *Addr, INT w_fd ));
+LOCAL void Do_ResolveAddr PARAMS(( struct sockaddr_in *Addr, int w_fd ));
 #endif
 
-LOCAL VOID Do_ResolveName PARAMS(( CHAR *Host, INT w_fd ));
+LOCAL void Do_ResolveName PARAMS(( char *Host, int w_fd ));
 
 #ifdef h_errno
-LOCAL CHAR *Get_Error PARAMS(( INT H_Error ));
+LOCAL char *Get_Error PARAMS(( int H_Error ));
 #endif
 
+LOCAL RES_STAT *New_Res_Stat PARAMS(( void ));
 
-GLOBAL VOID
-Resolve_Init( VOID )
+
+GLOBAL void
+Resolve_Init( void )
 {
        /* Initialize module */
 
@@ -75,23 +77,10 @@ Resolve_Addr( struct sockaddr_in *Addr )
         * can't be forked, this functions returns NULL. */
 
        RES_STAT *s;
-       INT pid;
+       int pid;
 
-       /* Allocate memory */
-       s = (RES_STAT *)malloc( sizeof( RES_STAT ));
-       if( ! s )
-       {
-               Log( LOG_EMERG, "Resolver: Can't allocate memory! [Resolve_Addr]" );
-               return NULL;
-       }
-
-       /* Initialize pipe for result */
-       if( pipe( s->pipe ) != 0 )
-       {
-               free( s );
-               Log( LOG_ALERT, "Resolver: Can't create output pipe: %s!", strerror( errno ));
-               return NULL;
-       }
+       s = New_Res_Stat( );
+       if( ! s ) return NULL;
 
        /* For sub-process */
        pid = fork( );
@@ -102,8 +91,6 @@ Resolve_Addr( struct sockaddr_in *Addr )
                FD_SET( s->pipe[0], &Resolver_FDs );
                if( s->pipe[0] > Conn_MaxFD ) Conn_MaxFD = s->pipe[0];
                s->pid = pid;
-               s->stage = 0;
-               s->bufpos = 0;
                return s;
        }
        else if( pid == 0 )
@@ -129,29 +116,16 @@ Resolve_Addr( struct sockaddr_in *Addr )
 
 
 GLOBAL RES_STAT *
-Resolve_Name( CHAR *Host )
+Resolve_Name( char *Host )
 {
        /* Resolve hostname (asynchronous!). On errors, e.g. if the child
         * process can't be forked, this functions returns NULL. */
 
        RES_STAT *s;
-       INT pid;
+       int pid;
 
-       /* Allocate memory */
-       s = (RES_STAT *)malloc( sizeof( RES_STAT ));
-       if( ! s )
-       {
-               Log( LOG_EMERG, "Resolver: Can't allocate memory! [Resolve_Name]" );
-               return NULL;
-       }
-
-       /* Initialize the pipe for the result */
-       if( pipe( s->pipe ) != 0 )
-       {
-               free( s );
-               Log( LOG_ALERT, "Resolver: Can't create output pipe: %s!", strerror( errno ));
-               return NULL;
-       }
+       s = New_Res_Stat( );
+       if( ! s ) return NULL;
 
        /* Fork sub-process */
        pid = fork( );
@@ -162,8 +136,6 @@ Resolve_Name( CHAR *Host )
                FD_SET( s->pipe[0], &Resolver_FDs );
                if( s->pipe[0] > Conn_MaxFD ) Conn_MaxFD = s->pipe[0];
                s->pid = pid;
-               s->stage = 0;
-               s->bufpos = 0;
                return s;
        }
        else if( pid == 0 )
@@ -185,26 +157,26 @@ Resolve_Name( CHAR *Host )
 
 
 #ifdef IDENTAUTH
-LOCAL VOID
-Do_ResolveAddr( struct sockaddr_in *Addr, int Sock, INT w_fd )
+LOCAL void
+Do_ResolveAddr( struct sockaddr_in *Addr, int Sock, int w_fd )
 #else
-LOCAL VOID
-Do_ResolveAddr( struct sockaddr_in *Addr, INT w_fd )
+LOCAL void
+Do_ResolveAddr( struct sockaddr_in *Addr, int w_fd )
 #endif
 {
        /* Resolver sub-process: resolve IP address and write result into
         * pipe to parent. */
 
-       CHAR hostname[HOST_LEN];
+       char hostname[HOST_LEN];
        struct hostent *h;
-       INT len;
+       int len;
 #ifdef IDENTAUTH
-       CHAR *res;
+       char *res;
 #endif
 
        /* Resolve IP address */
        Log_Resolver( LOG_DEBUG, "Now resolving %s ...", inet_ntoa( Addr->sin_addr ));
-       h = gethostbyaddr( (CHAR *)&Addr->sin_addr, sizeof( Addr->sin_addr ), AF_INET );
+       h = gethostbyaddr( (char *)&Addr->sin_addr, sizeof( Addr->sin_addr ), AF_INET );
        if( h ) strlcpy( hostname, h->h_name, sizeof( hostname ));
        else
        {
@@ -247,16 +219,16 @@ Do_ResolveAddr( struct sockaddr_in *Addr, INT w_fd )
 } /* Do_ResolveAddr */
 
 
-LOCAL VOID
-Do_ResolveName( CHAR *Host, INT w_fd )
+LOCAL void
+Do_ResolveName( char *Host, int w_fd )
 {
        /* Resolver sub-process: resolve name and write result into pipe
         * to parent. */
 
-       CHAR ip[16];
+       char ip[16];
        struct hostent *h;
        struct in_addr *addr;
-       INT len;
+       int len;
 
        Log_Resolver( LOG_DEBUG, "Now resolving \"%s\" ...", Host );
 
@@ -274,7 +246,7 @@ Do_ResolveName( CHAR *Host, INT w_fd )
 #else
                Log_Resolver( LOG_WARNING, "Can't resolve \"%s\"!", Host );
 #endif
-               strcpy( ip, "" );
+               ip[0] = '\0';
        }
        if( ip[0] ) Log_Resolver( LOG_DEBUG, "Ok, translated \"%s\" to %s.", Host, ip );
 
@@ -291,8 +263,8 @@ Do_ResolveName( CHAR *Host, INT w_fd )
 
 #ifdef h_errno
 
-LOCAL CHAR *
-Get_Error( INT H_Error )
+LOCAL char *
+Get_Error( int H_Error )
 {
        /* Get error message for H_Error */
 
@@ -314,4 +286,33 @@ Get_Error( INT H_Error )
 #endif
 
 
+LOCAL RES_STAT *
+New_Res_Stat( void )
+{
+       RES_STAT *s;
+
+       /* Allocate memory */
+       s = (RES_STAT *)malloc( sizeof( RES_STAT ));
+       if( ! s )
+       {
+               Log( LOG_EMERG, "Resolver: Can't allocate memory! [Resolve_Addr]" );
+               return NULL;
+       }
+
+       /* Initialize pipe for result */
+       if( pipe( s->pipe ) != 0 )
+       {
+               free( s );
+               Log( LOG_ALERT, "Resolver: Can't create output pipe: %s!", strerror( errno ));
+               return NULL;
+       }
+
+       s->stage = 0;
+       s->bufpos = 0;
+       s->pid = -1;
+
+       return s;
+} /* New_Res_Stat */
+
+
 /* -eof- */