Remove return value from isc_net_getudpportrange()

The function was already marked as never failing, always returning
ISC_R_SUCCESS, so there was a lot of dead code around checking whether
the result would be ISC_R_SUCCESS.  This has been cleaned up.

(cherry picked from commit c3ec414d88de0968e7ebc1518007c956842ce23e)

diff --git a/bin/nsupdate/nsupdate.c b/bin/nsupdate/nsupdate.c
index 76013feaa6b638f60160968f3f4ba1a47042560f..150ca90045ca5b425ac01336ab1bfd063a32910f 100644 (file)
--- a/bin/nsupdate/nsupdate.c
+++ b/bin/nsupdate/nsupdate.c
@@ -771,14 +771,12 @@ set_source_ports(dns_dispatchmgr_t *manager) {
 
        result = isc_portset_create(gmctx, &v4portset);
        check_result(result, "isc_portset_create (v4)");
-       result = isc_net_getudpportrange(AF_INET, &udpport_low, &udpport_high);
-       check_result(result, "isc_net_getudpportrange (v4)");
+       isc_net_getudpportrange(AF_INET, &udpport_low, &udpport_high);
        isc_portset_addrange(v4portset, udpport_low, udpport_high);
 
        result = isc_portset_create(gmctx, &v6portset);
        check_result(result, "isc_portset_create (v6)");
-       result = isc_net_getudpportrange(AF_INET6, &udpport_low, &udpport_high);
-       check_result(result, "isc_net_getudpportrange (v6)");
+       isc_net_getudpportrange(AF_INET6, &udpport_low, &udpport_high);
        isc_portset_addrange(v6portset, udpport_low, udpport_high);
 
        result = dns_dispatchmgr_setavailports(manager, v4portset, v6portset);

diff --git a/bin/tools/mdig.c b/bin/tools/mdig.c
index 94291d218ea4d565c58c92e8725cef7209e3353b..d6ade76584c3e0920673842f41118ee398be7023 100644 (file)
--- a/bin/tools/mdig.c
+++ b/bin/tools/mdig.c
@@ -2046,10 +2046,7 @@ set_source_ports(dns_dispatchmgr_t *manager) {
                fatal("isc_portset_create (v4) failed");
        }
 
-       result = isc_net_getudpportrange(AF_INET, &udpport_low, &udpport_high);
-       if (result != ISC_R_SUCCESS) {
-               fatal("isc_net_getudpportrange (v4) failed");
-       }
+       isc_net_getudpportrange(AF_INET, &udpport_low, &udpport_high);
 
        isc_portset_addrange(v4portset, udpport_low, udpport_high);
 
@@ -2057,10 +2054,7 @@ set_source_ports(dns_dispatchmgr_t *manager) {
        if (result != ISC_R_SUCCESS) {
                fatal("isc_portset_create (v6) failed");
        }
-       result = isc_net_getudpportrange(AF_INET6, &udpport_low, &udpport_high);
-       if (result != ISC_R_SUCCESS) {
-               fatal("isc_net_getudpportrange (v6) failed");
-       }
+       isc_net_getudpportrange(AF_INET6, &udpport_low, &udpport_high);
 
        isc_portset_addrange(v6portset, udpport_low, udpport_high);
 

diff --git a/lib/dns/client.c b/lib/dns/client.c
index 25a0106661f9529fc5a3df1f71d9b4a19124e3cf..12c61a09bf5a53e4264b24de6db5fc9efbc1471c 100644 (file)
--- a/lib/dns/client.c
+++ b/lib/dns/client.c
@@ -146,20 +146,14 @@ setsourceports(isc_mem_t *mctx, dns_dispatchmgr_t *manager) {
        if (result != ISC_R_SUCCESS) {
                goto cleanup;
        }
-       result = isc_net_getudpportrange(AF_INET, &udpport_low, &udpport_high);
-       if (result != ISC_R_SUCCESS) {
-               goto cleanup;
-       }
+       isc_net_getudpportrange(AF_INET, &udpport_low, &udpport_high);
        isc_portset_addrange(v4portset, udpport_low, udpport_high);
 
        result = isc_portset_create(mctx, &v6portset);
        if (result != ISC_R_SUCCESS) {
                goto cleanup;
        }
-       result = isc_net_getudpportrange(AF_INET6, &udpport_low, &udpport_high);
-       if (result != ISC_R_SUCCESS) {
-               goto cleanup;
-       }
+       isc_net_getudpportrange(AF_INET6, &udpport_low, &udpport_high);
        isc_portset_addrange(v6portset, udpport_low, udpport_high);
 
        result = dns_dispatchmgr_setavailports(manager, v4portset, v6portset);

diff --git a/lib/isc/include/isc/net.h b/lib/isc/include/isc/net.h
index eda799c60d255a023562b42c6d83a327eeebc318..e29967b59c77c7cbfc3a457ea6a8e3b7da10c20f 100644 (file)
--- a/lib/isc/include/isc/net.h
+++ b/lib/isc/include/isc/net.h
@@ -248,7 +248,7 @@ isc_net_enableipv4(void);
 void
 isc_net_enableipv6(void);
 
-isc_result_t
+void
 isc_net_getudpportrange(int af, in_port_t *low, in_port_t *high);
 /*%<
  * Returns system's default range of ephemeral UDP ports, if defined.

diff --git a/lib/isc/net.c b/lib/isc/net.c
index 988c242147d85585c853330dcbe7af8b3cec94cd..af951c0e29ef664f16ceb1fe558f11b1e767da58 100644 (file)
--- a/lib/isc/net.c
+++ b/lib/isc/net.c
@@ -407,7 +407,7 @@ getudpportrange_sysctl(int af, in_port_t *low, in_port_t *high) {
 #endif /* HAVE_SYSCTLBYNAME */
 #endif /* USE_SYSCTL_PORTRANGE */
 
-isc_result_t
+void
 isc_net_getudpportrange(int af, in_port_t *low, in_port_t *high) {
        int result = ISC_R_FAILURE;
 #if !defined(USE_SYSCTL_PORTRANGE) && defined(__linux)
@@ -446,8 +446,6 @@ isc_net_getudpportrange(int af, in_port_t *low, in_port_t *high) {
                *low = ISC_NET_PORTRANGELOW;
                *high = ISC_NET_PORTRANGEHIGH;
        }
-
-       return ISC_R_SUCCESS; /* we currently never fail in this function */
 }
 
 void