gethostbydns.c: dprintf conflicts with POSIX - rename to DPRINTF

This is done by the from-freebsd.sh script.
This commit is contained in:
Joel Sherrill 2012-07-11 17:36:34 -05:00
parent cac1c867a4
commit a98a274dbe

View File

@ -90,7 +90,7 @@ static void addrsort(char **, int, res_state);
#endif #endif
#ifdef DEBUG #ifdef DEBUG
static void dprintf(char *, int, res_state) __printflike(1, 0); static void DPRINTF(char *, int, res_state) __printflike(1, 0);
#endif #endif
#define MAXPACKET (64*1024) #define MAXPACKET (64*1024)
@ -109,7 +109,7 @@ int _dns_ttl_;
#ifdef DEBUG #ifdef DEBUG
static void static void
dprintf(msg, num, res) DPRINTF(msg, num, res)
char *msg; char *msg;
int num; int num;
res_state res; res_state res;
@ -122,7 +122,7 @@ dprintf(msg, num, res)
} }
} }
#else #else
# define dprintf(msg, num, res) /*nada*/ # define DPRINTF(msg, num, res) /*nada*/
#endif #endif
#define BOUNDED_INCR(x) \ #define BOUNDED_INCR(x) \
@ -375,13 +375,13 @@ gethostanswer(const querybuf *answer, int anslen, const char *qname, int qtype,
bp += sizeof(align) - ((u_long)bp % sizeof(align)); bp += sizeof(align) - ((u_long)bp % sizeof(align));
if (bp + n >= ep) { if (bp + n >= ep) {
dprintf("size (%d) too big\n", n, statp); DPRINTF("size (%d) too big\n", n, statp);
had_error++; had_error++;
continue; continue;
} }
if (hap >= &hed->h_addr_ptrs[_MAXADDRS-1]) { if (hap >= &hed->h_addr_ptrs[_MAXADDRS-1]) {
if (!toobig++) if (!toobig++)
dprintf("Too many addresses (%d)\n", DPRINTF("Too many addresses (%d)\n",
_MAXADDRS, statp); _MAXADDRS, statp);
cp += n; cp += n;
continue; continue;
@ -395,7 +395,7 @@ gethostanswer(const querybuf *answer, int anslen, const char *qname, int qtype,
} }
break; break;
default: default:
dprintf("Impossible condition (type=%d)\n", type, DPRINTF("Impossible condition (type=%d)\n", type,
statp); statp);
RES_SET_H_ERRNO(statp, NO_RECOVERY); RES_SET_H_ERRNO(statp, NO_RECOVERY);
return (-1); return (-1);
@ -522,12 +522,12 @@ _dns_gethostbyname(void *rval, void *cb_data, va_list ap)
n = res_nsearch(statp, name, C_IN, type, buf->buf, sizeof(buf->buf)); n = res_nsearch(statp, name, C_IN, type, buf->buf, sizeof(buf->buf));
if (n < 0) { if (n < 0) {
free(buf); free(buf);
dprintf("res_nsearch failed (%d)\n", n, statp); DPRINTF("res_nsearch failed (%d)\n", n, statp);
*h_errnop = statp->res_h_errno; *h_errnop = statp->res_h_errno;
return (NS_NOTFOUND); return (NS_NOTFOUND);
} else if (n > sizeof(buf->buf)) { } else if (n > sizeof(buf->buf)) {
free(buf); free(buf);
dprintf("static buffer is too small (%d)\n", n, statp); DPRINTF("static buffer is too small (%d)\n", n, statp);
*h_errnop = statp->res_h_errno; *h_errnop = statp->res_h_errno;
return (NS_UNAVAIL); return (NS_UNAVAIL);
} }
@ -629,13 +629,13 @@ _dns_gethostbyaddr(void *rval, void *cb_data, va_list ap)
sizeof buf->buf); sizeof buf->buf);
if (n < 0) { if (n < 0) {
free(buf); free(buf);
dprintf("res_nquery failed (%d)\n", n, statp); DPRINTF("res_nquery failed (%d)\n", n, statp);
*h_errnop = statp->res_h_errno; *h_errnop = statp->res_h_errno;
return (NS_UNAVAIL); return (NS_UNAVAIL);
} }
if (n > sizeof buf->buf) { if (n > sizeof buf->buf) {
free(buf); free(buf);
dprintf("static buffer is too small (%d)\n", n, statp); DPRINTF("static buffer is too small (%d)\n", n, statp);
*h_errnop = statp->res_h_errno; *h_errnop = statp->res_h_errno;
return (NS_UNAVAIL); return (NS_UNAVAIL);
} }