unifdef feature checks; we have all these things.

OK millert

5 files changed, 4 insertions, 71 deletions

diff --git a/usr.bin/dig/lib/isc/log.c b/usr.bin/dig/lib/isc/log.c
index 2d901974677..1aa1399061e 100644
--- a/usr.bin/dig/lib/isc/log.c
+++ b/usr.bin/dig/lib/isc/log.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: log.c,v 1.1 2020/02/07 09:58:53 florian Exp $ */
+/* $Id: log.c,v 1.2 2020/02/11 17:22:31 florian Exp $ */
 
 /*! \file
  * \author  Principal Authors: DCL */
@@ -47,10 +47,6 @@
  */
 #define LOG_BUFFER_SIZE	(8 * 1024)
 
-#ifndef PATH_MAX
-#define PATH_MAX 1024	/* AIX and others don't define this. */
-#endif
-
 /*!
  * This is the structure that holds each named channel.  A simple linked
  * list chains all of the channels together, so an individual channel is
diff --git a/usr.bin/dig/lib/isc/sockaddr.c b/usr.bin/dig/lib/isc/sockaddr.c
index 7df3b5b223e..95233cfeebf 100644
--- a/usr.bin/dig/lib/isc/sockaddr.c
+++ b/usr.bin/dig/lib/isc/sockaddr.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sockaddr.c,v 1.1 2020/02/07 09:58:54 florian Exp $ */
+/* $Id: sockaddr.c,v 1.2 2020/02/11 17:22:31 florian Exp $ */
 
 /*! \file */
 
@@ -322,23 +322,7 @@ isc_sockaddr_pf(const isc_sockaddr_t *sockaddr) {
 	 * Get the protocol family of 'sockaddr'.
 	 */
 
-#if (AF_INET == PF_INET && AF_INET6 == PF_INET6)
-	/*
-	 * Assume that PF_xxx == AF_xxx for all AF and PF.
-	 */
 	return (sockaddr->type.sa.sa_family);
-#else
-	switch (sockaddr->type.sa.sa_family) {
-	case AF_INET:
-		return (PF_INET);
-	case AF_INET6:
-		return (PF_INET6);
-	default:
-		FATAL_ERROR(__FILE__, __LINE__,
-			    "unknown address family: %d",
-			    (int)sockaddr->type.sa.sa_family);
-	}
-#endif
 }
 
 void
diff --git a/usr.bin/dig/lib/isc/unix/errno2result.c b/usr.bin/dig/lib/isc/unix/errno2result.c
index 4430910a346..05ffbdf770d 100644
--- a/usr.bin/dig/lib/isc/unix/errno2result.c
+++ b/usr.bin/dig/lib/isc/unix/errno2result.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: errno2result.c,v 1.1 2020/02/07 09:58:54 florian Exp $ */
+/* $Id: errno2result.c,v 1.2 2020/02/11 17:22:31 florian Exp $ */
 
 /*! \file */
 
@@ -59,54 +59,30 @@ isc___errno2result(int posixerrno, isc_boolean_t dolog,
 	case ENFILE:
 	case EMFILE:
 		return (ISC_R_TOOMANYOPENFILES);
-#ifdef EOVERFLOW
 	case EOVERFLOW:
 		return (ISC_R_RANGE);
-#endif
 	case EPIPE:
-#ifdef ECONNRESET
 	case ECONNRESET:
-#endif
-#ifdef ECONNABORTED
 	case ECONNABORTED:
-#endif
 		return (ISC_R_CONNECTIONRESET);
-#ifdef ENOTCONN
 	case ENOTCONN:
 		return (ISC_R_NOTCONNECTED);
-#endif
-#ifdef ETIMEDOUT
 	case ETIMEDOUT:
 		return (ISC_R_TIMEDOUT);
-#endif
-#ifdef ENOBUFS
 	case ENOBUFS:
 		return (ISC_R_NORESOURCES);
-#endif
-#ifdef EAFNOSUPPORT
 	case EAFNOSUPPORT:
 		return (ISC_R_FAMILYNOSUPPORT);
-#endif
-#ifdef ENETDOWN
 	case ENETDOWN:
 		return (ISC_R_NETDOWN);
-#endif
-#ifdef EHOSTDOWN
 	case EHOSTDOWN:
 		return (ISC_R_HOSTDOWN);
-#endif
-#ifdef ENETUNREACH
 	case ENETUNREACH:
 		return (ISC_R_NETUNREACH);
-#endif
-#ifdef EHOSTUNREACH
 	case EHOSTUNREACH:
 		return (ISC_R_HOSTUNREACH);
-#endif
-#ifdef EADDRINUSE
 	case EADDRINUSE:
 		return (ISC_R_ADDRINUSE);
-#endif
 	case EADDRNOTAVAIL:
 		return (ISC_R_ADDRNOTAVAIL);
 	case ECONNREFUSED:
diff --git a/usr.bin/dig/lib/isc/unix/include/isc/net.h b/usr.bin/dig/lib/isc/unix/include/isc/net.h
index b8e1d8c6478..247af2cadfb 100644
--- a/usr.bin/dig/lib/isc/unix/include/isc/net.h
+++ b/usr.bin/dig/lib/isc/unix/include/isc/net.h
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: net.h,v 1.1 2020/02/07 09:58:54 florian Exp $ */
+/* $Id: net.h,v 1.2 2020/02/11 17:22:31 florian Exp $ */
 
 #ifndef ISC_NET_H
 #define ISC_NET_H 1
@@ -84,19 +84,6 @@
 #include <isc/lang.h>
 #include <isc/types.h>
 
-#ifndef IN6_IS_ADDR_SITELOCAL
-/*% is IPv6 address sitelocal? */
-#define IN6_IS_ADDR_SITELOCAL(a) \
-	(((a)->s6_addr[0] == 0xfe) && (((a)->s6_addr[1] & 0xc0) == 0xc0))
-#endif
-
-
-#ifndef IN6_IS_ADDR_LOOPBACK
-/*% is IPv6 address loopback? */
-#define IN6_IS_ADDR_LOOPBACK(x) \
-	(memcmp((x)->s6_addr, in6addr_loopback.s6_addr, 16) == 0)
-#endif
-
 /*% IP address. */
 #define ISC__IPADDR(x)	((uint32_t)htonl((uint32_t)(x)))
 
diff --git a/usr.bin/dig/lib/isc/unix/socket.c b/usr.bin/dig/lib/isc/unix/socket.c
index a115ed1492f..0bed76156bd 100644
--- a/usr.bin/dig/lib/isc/unix/socket.c
+++ b/usr.bin/dig/lib/isc/unix/socket.c
@@ -992,16 +992,12 @@ doio_recv(isc__socket_t *sock, isc_socketevent_t *dev) {
 		SOFT_OR_HARD(EADDRNOTAVAIL, ISC_R_ADDRNOTAVAIL);
 		ALWAYS_HARD(ENOBUFS, ISC_R_NORESOURCES);
 		/* Should never get this one but it was seen. */
-#ifdef ENOPROTOOPT
 		SOFT_OR_HARD(ENOPROTOOPT, ISC_R_HOSTUNREACH);
-#endif
 		/*
 		 * HPUX returns EPROTO and EINVAL on receiving some ICMP/ICMPv6
 		 * errors.
 		 */
-#ifdef EPROTO
 		SOFT_OR_HARD(EPROTO, ISC_R_HOSTUNREACH);
-#endif
 		SOFT_OR_HARD(EINVAL, ISC_R_HOSTUNREACH);
 
 #undef SOFT_OR_HARD
@@ -1153,9 +1149,7 @@ doio_send(isc__socket_t *sock, isc_socketevent_t *dev) {
 		ALWAYS_HARD(EAFNOSUPPORT, ISC_R_ADDRNOTAVAIL);
 		ALWAYS_HARD(EADDRNOTAVAIL, ISC_R_ADDRNOTAVAIL);
 		ALWAYS_HARD(EHOSTUNREACH, ISC_R_HOSTUNREACH);
-#ifdef EHOSTDOWN
 		ALWAYS_HARD(EHOSTDOWN, ISC_R_HOSTUNREACH);
-#endif
 		ALWAYS_HARD(ENETUNREACH, ISC_R_NETUNREACH);
 		ALWAYS_HARD(ENOBUFS, ISC_R_NORESOURCES);
 		ALWAYS_HARD(EPERM, ISC_R_HOSTUNREACH);
@@ -2434,9 +2428,7 @@ isc__socket_connect(isc_socket_t *sock0, isc_sockaddr_t *addr,
 			ERROR_MATCH(EAFNOSUPPORT, ISC_R_ADDRNOTAVAIL);
 			ERROR_MATCH(ECONNREFUSED, ISC_R_CONNREFUSED);
 			ERROR_MATCH(EHOSTUNREACH, ISC_R_HOSTUNREACH);
-#ifdef EHOSTDOWN
 			ERROR_MATCH(EHOSTDOWN, ISC_R_HOSTUNREACH);
-#endif
 			ERROR_MATCH(ENETUNREACH, ISC_R_NETUNREACH);
 			ERROR_MATCH(ENOBUFS, ISC_R_NORESOURCES);
 			ERROR_MATCH(EPERM, ISC_R_HOSTUNREACH);
@@ -2574,9 +2566,7 @@ internal_connect(isc_task_t *me, isc_event_t *ev) {
 			ERROR_MATCH(EAFNOSUPPORT, ISC_R_ADDRNOTAVAIL);
 			ERROR_MATCH(ECONNREFUSED, ISC_R_CONNREFUSED);
 			ERROR_MATCH(EHOSTUNREACH, ISC_R_HOSTUNREACH);
-#ifdef EHOSTDOWN
 			ERROR_MATCH(EHOSTDOWN, ISC_R_HOSTUNREACH);
-#endif
 			ERROR_MATCH(ENETUNREACH, ISC_R_NETUNREACH);
 			ERROR_MATCH(ENOBUFS, ISC_R_NORESOURCES);
 			ERROR_MATCH(EPERM, ISC_R_HOSTUNREACH);