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.

diff --git a/bin/nsupdate/nsupdate.c b/bin/nsupdate/nsupdate.c
index 820029d3e84dd645f5d2ebc37d8c77d8ec5bba00..0f83d40be57525b610178f9edae80da97bdfb7ea 100644 (file)
--- a/bin/nsupdate/nsupdate.c
+++ b/bin/nsupdate/nsupdate.c
@@ -749,13 +749,11 @@ set_source_ports(dns_dispatchmgr_t *manager) {
        isc_result_t result;
 
        isc_portset_create(isc_g_mctx, &v4portset);
-       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);
 
        isc_portset_create(isc_g_mctx, &v6portset);
-       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 6240401bb36cff342c6eb0c049dc37540f38dbdc..d0a2c7145ca6013f42199b174e7523ba3df2fc38 100644 (file)
--- a/bin/tools/mdig.c
+++ b/bin/tools/mdig.c
@@ -2001,18 +2001,12 @@ set_source_ports(dns_dispatchmgr_t *manager) {
        isc_result_t result;
 
        isc_portset_create(isc_g_mctx, &v4portset);
-       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);
 
        isc_portset_create(isc_g_mctx, &v6portset);
-       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 6027c0d081070c82fc915f8e3194dd20a94201b2..73ea515cecce577ab663a8bbb20866df545ddf2a 100644 (file)
--- a/lib/dns/client.c
+++ b/lib/dns/client.c
@@ -142,22 +142,17 @@ setsourceports(isc_mem_t *mctx, dns_dispatchmgr_t *manager) {
        isc_result_t result;
 
        isc_portset_create(mctx, &v4portset);
-       CHECK(isc_net_getudpportrange(AF_INET, &udpport_low, &udpport_high));
+       isc_net_getudpportrange(AF_INET, &udpport_low, &udpport_high);
        isc_portset_addrange(v4portset, udpport_low, udpport_high);
 
        isc_portset_create(mctx, &v6portset);
-       CHECK(isc_net_getudpportrange(AF_INET6, &udpport_low, &udpport_high));
+       isc_net_getudpportrange(AF_INET6, &udpport_low, &udpport_high);
        isc_portset_addrange(v6portset, udpport_low, udpport_high);
 
        result = dns_dispatchmgr_setavailports(manager, v4portset, v6portset);
 
-cleanup:
-       if (v4portset != NULL) {
-               isc_portset_destroy(mctx, &v4portset);
-       }
-       if (v6portset != NULL) {
-               isc_portset_destroy(mctx, &v6portset);
-       }
+       isc_portset_destroy(mctx, &v4portset);
+       isc_portset_destroy(mctx, &v6portset);
 
        return result;
 }