generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed the problem where next_lookup would use 'status' uninitialized. Now

Browse Source 
it gets passed the initial value as an argument.
This commit is contained in:
Daniel Stenberg 2007-10-02 08:12:30 +00:00
parent b03abddb28
commit 19c8da85d8
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ares/ares_gethostbyname.c
View File

@ -57,7 +57,7 @@ struct host_query {
int timeouts; int timeouts;
}; };
static void next_lookup(struct host_query *hquery); static void next_lookup(struct host_query *hquery, int status);
static void host_callback(void *arg, int status, int timeouts, static void host_callback(void *arg, int status, int timeouts,
unsigned char *abuf, int alen); unsigned char *abuf, int alen);
static void end_hquery(struct host_query *hquery, int status, static void end_hquery(struct host_query *hquery, int status,
@ -111,12 +111,11 @@ void ares_gethostbyname(ares_channel channel, const char *name, int family,
hquery->timeouts = 0; hquery->timeouts = 0;
/* Start performing lookups according to channel->lookups. */ /* Start performing lookups according to channel->lookups. */
next_lookup(hquery); next_lookup(hquery, ARES_SUCCESS);
} }
static void next_lookup(struct host_query *hquery) static void next_lookup(struct host_query *hquery, int status)
{ {
int status;
const char *p; const char *p;
struct hostent *host; struct hostent *host;
@ -128,8 +127,8 @@ static void next_lookup(struct host_query *hquery)
/* DNS lookup */ /* DNS lookup */
hquery->remaining_lookups = p + 1; hquery->remaining_lookups = p + 1;
if (hquery->family == AF_INET6) if (hquery->family == AF_INET6)
ares_search(hquery->channel, hquery->name, C_IN, T_AAAA, host_callback, ares_search(hquery->channel, hquery->name, C_IN, T_AAAA,
hquery); host_callback, hquery);
else else
ares_search(hquery->channel, hquery->name, C_IN, T_A, host_callback, ares_search(hquery->channel, hquery->name, C_IN, T_A, host_callback,
hquery); hquery);
@ -183,7 +182,7 @@ static void host_callback(void *arg, int status, int timeouts,
else if (status == ARES_EDESTRUCTION) else if (status == ARES_EDESTRUCTION)
end_hquery(hquery, status, NULL); end_hquery(hquery, status, NULL);
else else
next_lookup(hquery); next_lookup(hquery, status);
} }
static void end_hquery(struct host_query *hquery, int status, static void end_hquery(struct host_query *hquery, int status,