oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

(dns_lookup_int): s/stat/state/ to avoid shadowing

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@14697 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2005-03-30 16:47:18 +00:00
parent dbba0be7b2
commit f4727981b9
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/roken/resolve.c
View File

@@ -486,9 +486,9 @@ dns_lookup_int(const char *domain, int rr_class, int rr_type)
int size; int size;
int len; int len;
#ifdef HAVE_RES_NSEARCH #ifdef HAVE_RES_NSEARCH
struct __res_state stat; struct __res_state state;
memset(&stat, 0, sizeof(stat)); memset(&state, 0, sizeof(state));
if(res_ninit(&stat)) if(res_ninit(&state))
return NULL; /* is this the best we can do? */ return NULL; /* is this the best we can do? */
#elif defined(HAVE__RES) #elif defined(HAVE__RES)
u_long old_options = 0; u_long old_options = 0;
@@ -505,7 +505,7 @@ dns_lookup_int(const char *domain, int rr_class, int rr_type)
size = len; size = len;
if (_resolve_debug) { if (_resolve_debug) {
#ifdef HAVE_RES_NSEARCH #ifdef HAVE_RES_NSEARCH
stat.options |= RES_DEBUG; state.options |= RES_DEBUG;
#elif defined(HAVE__RES) #elif defined(HAVE__RES)
old_options = _res.options; old_options = _res.options;
_res.options |= RES_DEBUG; _res.options |= RES_DEBUG;
@@ -516,12 +516,12 @@ dns_lookup_int(const char *domain, int rr_class, int rr_type)
reply = malloc(size); reply = malloc(size);
if (reply == NULL) { if (reply == NULL) {
#ifdef HAVE_RES_NSEARCH #ifdef HAVE_RES_NSEARCH
res_nclose(&stat); res_nclose(&state);
#endif #endif
return NULL; return NULL;
} }
#ifdef HAVE_RES_NSEARCH #ifdef HAVE_RES_NSEARCH
len = res_nsearch(&stat, domain, rr_class, rr_type, reply, size); len = res_nsearch(&state, domain, rr_class, rr_type, reply, size);
#else #else
len = res_search(domain, rr_class, rr_type, reply, size); len = res_search(domain, rr_class, rr_type, reply, size);
#endif #endif
@@ -534,14 +534,14 @@ dns_lookup_int(const char *domain, int rr_class, int rr_type)
} }
if (len < 0) { if (len < 0) {
#ifdef HAVE_RES_NSEARCH #ifdef HAVE_RES_NSEARCH
res_nclose(&stat); res_nclose(&state);
#endif #endif
free(reply); free(reply);
return NULL; return NULL;
} }
} while (size < len && len < rk_DNS_MAX_PACKET_SIZE); } while (size < len && len < rk_DNS_MAX_PACKET_SIZE);
#ifdef HAVE_RES_NSEARCH #ifdef HAVE_RES_NSEARCH
res_nclose(&stat); res_nclose(&state);
#endif #endif
len = min(len, size); len = min(len, size);