From c3ec414d88de0968e7ebc1518007c956842ce23e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Thu, 19 Feb 2026 12:05:58 +0100 Subject: [PATCH] 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. --- bin/nsupdate/nsupdate.c | 6 ++---- bin/tools/mdig.c | 10 ++-------- lib/dns/client.c | 13 ++++--------- 3 files changed, 8 insertions(+), 21 deletions(-) diff --git a/bin/nsupdate/nsupdate.c b/bin/nsupdate/nsupdate.c index 820029d3e8..0f83d40be5 100644 --- 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 6240401bb3..d0a2c7145c 100644 --- 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 6027c0d081..73ea515cec 100644 --- 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; }