From e01eef67baf2caa155b1d7ff5e0c191fd0fd4828 Mon Sep 17 00:00:00 2001
From: Florian Weimer <fweimer@redhat.com>
Date: Thu, 28 Apr 2016 13:58:18 +0200
Subject: resolv: Assorted preprocessor cleanups

---
 ChangeLog            |  9 +++++++++
 resolv/gethnamaddr.c | 38 +++-----------------------------------
 resolv/res_init.c    |  4 ----
 3 files changed, 12 insertions(+), 39 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 30b285ceb6..8c1de33988 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2016-04-28  Florian Weimer  <fweimer@redhat.com>
+
+	* resolv/res_init.c (isascii): Do not define.  Use definition in
+	<ctype.h>.
+	* resolv/gethnamaddr.c: Remove USE_OPTIONS_H conditional.
+	(LOG_AUTH): Remove.
+	(SPRINTF): Remove, adjust caller.
+	(MULTI_PTRS_ARE_ALIASES): Remove, always defined.
+
 2016-04-28  Florian Weimer  <fweimer@redhat.com>
 
 	* resolv/nss_dns/dns-host.c (_nss_dns_gethostbyaddr2_r): Remove
diff --git a/resolv/gethnamaddr.c b/resolv/gethnamaddr.c
index 97e2dc3f08..9ad2c3010a 100644
--- a/resolv/gethnamaddr.c
+++ b/resolv/gethnamaddr.c
@@ -69,22 +69,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#ifndef LOG_AUTH
-# define LOG_AUTH 0
-#endif
-
-#define MULTI_PTRS_ARE_ALIASES 1	/* XXX - experimental */
-
-#if defined(USE_OPTIONS_H)
-# include <../conf/options.h>
-#endif
-
-#ifdef SPRINTF_CHAR
-# define SPRINTF(x) strlen(sprintf/**/x)
-#else
-# define SPRINTF(x) ((size_t)sprintf x)
-#endif
-
 #define	MAXALIASES	35
 #define	MAXADDRS	35
 
@@ -332,7 +316,6 @@ getanswer (const querybuf *answer, int anslen, const char *qname, int qtype)
 				had_error++;
 				break;
 			}
-#if MULTI_PTRS_ARE_ALIASES
 			cp += n;
 			if (cp != erdata) {
 				__set_h_errno (NO_RECOVERY);
@@ -354,21 +337,6 @@ getanswer (const querybuf *answer, int anslen, const char *qname, int qtype)
 				buflen -= n;
 			}
 			break;
-#else
-			host.h_name = bp;
-			if (_res.options & RES_USE_INET6) {
-				n = strlen(bp) + 1;	/* for the \0 */
-				if (n >= MAXHOSTNAMELEN) {
-					had_error++;
-					break;
-				}
-				bp += n;
-				buflen -= n;
-				map_v4v6_hostent(&host, &bp, &buflen);
-			}
-			__set_h_errno (NETDB_SUCCESS);
-			return (&host);
-#endif
 		case T_A:
 		case T_AAAA:
 			if (strcasecmp(host.h_name, bp) != 0) {
@@ -660,9 +628,9 @@ gethostbyaddr (const void *addr, socklen_t len, int af)
 	case AF_INET6:
 		qp = qbuf;
 		for (n = IN6ADDRSZ - 1; n >= 0; n--) {
-			qp += SPRINTF((qp, "%x.%x.",
-				       uaddr[n] & 0xf,
-				       (uaddr[n] >> 4) & 0xf));
+			qp += sprintf(qp, "%x.%x.",
+				      uaddr[n] & 0xf,
+				      (uaddr[n] >> 4) & 0xf);
 		}
 		strcpy(qp, "ip6.arpa");
 		break;
diff --git a/resolv/res_init.c b/resolv/res_init.c
index 407e6091e7..915a70aef3 100644
--- a/resolv/res_init.c
+++ b/resolv/res_init.c
@@ -94,10 +94,6 @@ static const char sort_mask_chars[] = "/&";
 #define ISSORTMASK(ch) (strchr(sort_mask_chars, ch) != NULL)
 static u_int32_t net_mask (struct in_addr) __THROW;
 
-#if !defined(isascii)	/* XXX - could be a function */
-# define isascii(c) (!(c & 0200))
-#endif
-
 unsigned long long int __res_initstamp attribute_hidden;
 
 /*
-- 
cgit v1.2.3