removed Resolve_SUCCESS() Macro and Res_Stat->sucess boolean (no longer used/needed)

diff --git a/src/ngircd/resolve.c b/src/ngircd/resolve.c
index 2f0534a58de25bd0bfd4f285d9fc308e5ee78350..e46e4823b31792a83f198a540e6ef15e065888b0 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.22 2006/02/08 15:20:21 fw Exp $";
+static char UNUSED id[] = "$Id: resolve.c,v 1.23 2006/02/08 15:24:10 fw Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -83,7 +83,6 @@ Resolve_Addr( RES_STAT *s, struct sockaddr_in *Addr, int identsock, void (*cbfun
        /* Resolve IP (asynchronous!). */
        int pid, pipefd[2];
        assert(s != NULL);
-       s->success = false;
 
        pid = Resolver_fork(pipefd);
        if (pid > 0) {
@@ -109,7 +108,6 @@ Resolve_Name( RES_STAT *s, const char *Host, void (*cbfunc)(int, short))
        /* Resolve hostname (asynchronous!). */
        int pid, pipefd[2];
        assert(s != NULL);
-       s->success = false;
 
        pid = Resolver_fork(pipefd);
        if (pid > 0) {
@@ -136,7 +134,6 @@ Resolve_Init(RES_STAT *s)
        assert(s != NULL);
        s->resolver_fd = -1;
        s->pid = 0;
-       /* s->success must not be changed -- it will be set by other Resolve_*() functions */
 }
 
 
@@ -356,7 +353,6 @@ Resolve_Read( RES_STAT *s, void* readbuf, size_t buflen)
                return 0;
        }
 
-       s->success = true;
        return bytes_read;
 }
 /* -eof- */

diff --git a/src/ngircd/resolve.h b/src/ngircd/resolve.h
index 030356886c6f28d2c8280d251343ea2fb3a3e055..47153bbdb855c47b6f8741604ce1ef6283822af4 100644 (file)
--- a/src/ngircd/resolve.h
+++ b/src/ngircd/resolve.h
@@ -8,7 +8,7 @@
  * (at your option) any later version.
  * Please read the file COPYING, README and AUTHORS for more information.
  *
- * $Id: resolve.h,v 1.11 2005/09/12 19:10:21 fw Exp $
+ * $Id: resolve.h,v 1.12 2006/02/08 15:24:10 fw Exp $
  *
  * Asynchronous resolver (header)
  */
@@ -24,13 +24,11 @@
 typedef struct _Res_Stat {
        int pid;                        /* PID of resolver process */
        int resolver_fd;                /* pipe fd for lookup result. */
-       bool success;                   /* resolver returned data */
 } RES_STAT;
 
 
 #define Resolve_Getfd(x)               ((x)->resolver_fd)
 #define Resolve_INPROGRESS(x)          ((x)->resolver_fd >= 0)
-#define Resolve_SUCCESS(x)             ((x)->resolver_fd < 0 && (x)->success)
 
 GLOBAL bool Resolve_Addr PARAMS(( RES_STAT *s, struct sockaddr_in *Addr, int identsock, void (*cbfunc)(int, short)));
 GLOBAL bool Resolve_Name PARAMS(( RES_STAT *s, const char *Host, void (*cbfunc)(int, short) ));