From 89ecf4ac0149304ecfed5e0a86f633bc3a0f3bcc Mon Sep 17 00:00:00 2001 From: Gisle Vanem Date: Sun, 18 Jan 2009 17:03:31 +0000 Subject: fopen() returns error in 'errno' even on Windows. So don't use ERRNO (GetLastError()). Trimmed trailing blanks. --- ares/ares_search.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'ares/ares_search.c') diff --git a/ares/ares_search.c b/ares/ares_search.c index 5131f35b8..38d689c00 100644 --- a/ares/ares_search.c +++ b/ares/ares_search.c @@ -60,7 +60,7 @@ void ares_search(ares_channel channel, const char *name, int dnsclass, char *s; const char *p; int status, ndots; - + /* If name only yields one domain to search, then we don't have * to keep extra state, so just do an ares_query(). */ @@ -148,7 +148,7 @@ static void search_callback(void *arg, int status, int timeouts, struct search_query *squery = (struct search_query *) arg; ares_channel channel = squery->channel; char *s; - + squery->timeouts += timeouts; /* Stop searching unless we got a non-fatal error. */ @@ -161,7 +161,7 @@ static void search_callback(void *arg, int status, int timeouts, if (squery->trying_as_is) squery->status_as_is = status; - /* + /* * If we ever get ARES_ENODATA along the way, record that; if the search * should run to the very end and we got at least one ARES_ENODATA, * then callers like ares_gethostbyname() may want to try a T_A search @@ -290,10 +290,10 @@ static int single_domain(ares_channel channel, const char *name, char **s) if (status != ARES_SUCCESS) return status; } - else + else { - error = ERRNO; - switch(error) + error = errno; + switch(error) { case ENOENT: case ESRCH: @@ -301,7 +301,7 @@ static int single_domain(ares_channel channel, const char *name, char **s) default: DEBUGF(fprintf(stderr, "fopen() failed with error: %d %s\n", error, strerror(error))); - DEBUGF(fprintf(stderr, "Error opening file: %s\n", + DEBUGF(fprintf(stderr, "Error opening file: %s\n", hostaliases)); *s = NULL; return ARES_EFILE; -- cgit v1.2.3