From bd0e95e605fff368075e869efe6d31ebe471ea49 Mon Sep 17 00:00:00 2001 From: Gary Mills Date: Mon, 20 Jul 2015 12:47:39 -0500 Subject: 1926 libresolv evades compiler warnings Reviewed by: Toomas Soome Reviewed by: Albert Lee Approved by: Robert Mustacchi --- usr/src/lib/libresolv/res_gethost.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'usr/src/lib/libresolv/res_gethost.c') diff --git a/usr/src/lib/libresolv/res_gethost.c b/usr/src/lib/libresolv/res_gethost.c index bc25771d6d..9649677d2a 100644 --- a/usr/src/lib/libresolv/res_gethost.c +++ b/usr/src/lib/libresolv/res_gethost.c @@ -1,4 +1,5 @@ /* + * Copyright 2015 Gary Mills * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -23,10 +24,12 @@ #include #include #include +#include #include #include #include #include +#include "crossl.h" /* * When the name service switch calls libresolv, it doesn't want fallback @@ -103,8 +106,8 @@ getanswer(answer, anslen, iquery) cp = answer->buf + sizeof (HEADER); if (qdcount) { if (iquery) { - if ((n = dn_expand((char *)answer->buf, eom, - cp, bp, buflen)) < 0) { + if ((n = dn_expand(answer->buf, eom, + cp, (u_char *)bp, buflen)) < 0) { h_errno = NO_RECOVERY; return ((struct hostent *) NULL); } @@ -132,8 +135,8 @@ getanswer(answer, anslen, iquery) #endif haveanswer = 0; while (--ancount >= 0 && cp < eom && haveanswer < MAXADDRS) { - if ((n = dn_expand((char *)answer->buf, eom, - cp, bp, buflen)) < 0) + if ((n = dn_expand(answer->buf, eom, + cp, (u_char *)bp, buflen)) < 0) break; cp += n; type = _getshort(cp); @@ -153,8 +156,8 @@ getanswer(answer, anslen, iquery) continue; } if (iquery && type == T_PTR) { - if ((n = dn_expand((char *)answer->buf, eom, - cp, bp, buflen)) < 0) { + if ((n = dn_expand(answer->buf, eom, + cp, (u_char *)bp, buflen)) < 0) { cp += n; continue; } @@ -231,7 +234,6 @@ res_gethostbyname(name) querybuf buf; register char *cp; int n; - struct hostent *hp, *gethostdomain(); /* * disallow names consisting only of digits/dots, unless @@ -281,7 +283,7 @@ _getrhbyaddr(addr, len, type) ((unsigned)addr[2] & 0xff), ((unsigned)addr[1] & 0xff), ((unsigned)addr[0] & 0xff)); - n = res_query(qbuf, C_IN, T_PTR, (char *)&buf, sizeof (buf)); + n = res_query(qbuf, C_IN, T_PTR, (u_char *)&buf, sizeof (buf)); if (n < 0) { #ifdef DEBUG if (_res.options & RES_DEBUG) -- cgit v1.2.3