Miscellaneous compiler errors from port of BIND 9 code

bk: 41cb2990X9pI-zy5Lky51y_32kGgvA

diff --git a/include/isc/net.h b/include/isc/net.h
index a5d9859f157ed836d090c496537fc16cf97b5573..dae59780b69b70eee420b47fbe4eef5eabf67a10 100644 (file)
--- a/include/isc/net.h
+++ b/include/isc/net.h
@@ -308,20 +308,19 @@ isc_net_enableipv6(void);
 #ifdef ISC_PLATFORM_NEEDNTOP
 const char *
 isc_net_ntop(int af, const void *src, char *dst, size_t size);
-#ifdef ISC_PLATFORM_NEEDNTOP
 #define inet_ntop isc_net_ntop
 #endif
 
+#ifdef ISC_PLATFORM_NEEDPTON
 int
 isc_net_pton(int af, const char *src, void *dst);
-#ifdef ISC_PLATFORM_NEEDPTON
 #undef inet_pton
 #define inet_pton isc_net_pton
 #endif
 
+#ifdef ISC_PLATFORM_NEEDATON
 int
 isc_net_aton(const char *cp, struct in_addr *addr);
-#ifdef ISC_PLATFORM_NEEDATON
 #define inet_aton isc_net_aton
 #endif
 

diff --git a/libisc/net.c b/libisc/net.c
index db832667f184e8ce3ce0a40b1cc9cb547155435d..64381b9d4f3ac9b1d50d027e20586587508ff9f9 100644 (file)
--- a/libisc/net.c
+++ b/libisc/net.c
@@ -66,7 +66,7 @@ try_proto(int domain) {
                default:
                        isc__strerror(errno, strbuf, sizeof(strbuf));
                        UNEXPECTED_ERROR(__FILE__, __LINE__,
-                                        "socket() %s failed",
+                                        "socket() failed: %s",
                                         strbuf);
                        return (ISC_R_UNEXPECTED);
                }
@@ -160,11 +160,7 @@ try_ipv6only(void) {
        if (s == -1) {
                isc__strerror(errno, strbuf, sizeof(strbuf));
                UNEXPECTED_ERROR(__FILE__, __LINE__,
-                                "socket() %s: %s",
-                                isc_msgcat_get(isc_msgcat,
-                                               ISC_MSGSET_GENERAL,
-                                               ISC_MSG_FAILED,
-                                               "failed"),
+                                "socket() failed: %s",
                                 strbuf);
                ipv6only_result = ISC_R_UNEXPECTED;
                return;
@@ -183,11 +179,7 @@ try_ipv6only(void) {
        if (s == -1) {
                isc__strerror(errno, strbuf, sizeof(strbuf));
                UNEXPECTED_ERROR(__FILE__, __LINE__,
-                                "socket() %s: %s",
-                                isc_msgcat_get(isc_msgcat,
-                                               ISC_MSGSET_GENERAL,
-                                               ISC_MSG_FAILED,
-                                               "failed"),
+                                "socket() failed: %s",
                                 strbuf);
                ipv6only_result = ISC_R_UNEXPECTED;
                return;
@@ -234,11 +226,7 @@ try_ipv6pktinfo(void) {
        if (s == -1) {
                isc__strerror(errno, strbuf, sizeof(strbuf));
                UNEXPECTED_ERROR(__FILE__, __LINE__,
-                                "socket() %s: %s",
-                                isc_msgcat_get(isc_msgcat,
-                                               ISC_MSGSET_GENERAL,
-                                               ISC_MSG_FAILED,
-                                               "failed"),
+                                "socket() failed: %s",
                                 strbuf);
                ipv6pktinfo_result = ISC_R_UNEXPECTED;
                return;