From edfae82c8202b2c31547f83ffaaa95c1ea6c13f5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Wed, 6 Oct 2021 13:41:21 +0200 Subject: [PATCH] dns/resolver.c: Return void when ISC_R_SUCCESS is only returned value With isc_mem_get() and dns_name_dup() no longer being able to fail, some functions can now only return ISC_R_SUCCESS. Change the return type to void for the following function(s): * dns_zone_setprimaries() * dns_zone_setparentals() * dns_zone_setparentals() * dns_zone_setalsonotify() --- bin/named/zoneconf.c | 29 +++++++++--------------- lib/dns/include/dns/zone.h | 8 +++---- lib/dns/zone.c | 45 +++++++++++--------------------------- 3 files changed, 27 insertions(+), 55 deletions(-) diff --git a/bin/named/zoneconf.c b/bin/named/zoneconf.c index c6b832cc34a..80cc7d32b60 100644 --- a/bin/named/zoneconf.c +++ b/bin/named/zoneconf.c @@ -1288,14 +1288,12 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig, RETERR(named_config_getipandkeylist(config, "primaries", obj, mctx, &ipkl)); - result = dns_zone_setalsonotify(zone, ipkl.addrs, - ipkl.dscps, ipkl.keys, - ipkl.tlss, ipkl.count); + dns_zone_setalsonotify(zone, ipkl.addrs, ipkl.dscps, + ipkl.keys, ipkl.tlss, + ipkl.count); dns_ipkeylist_clear(mctx, &ipkl); - RETERR(result); } else { - RETERR(dns_zone_setalsonotify(zone, NULL, NULL, NULL, - NULL, 0)); + dns_zone_setalsonotify(zone, NULL, NULL, NULL, NULL, 0); } obj = NULL; @@ -1723,14 +1721,11 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig, dns_ipkeylist_init(&ipkl); RETERR(named_config_getipandkeylist( config, "parental-agents", obj, mctx, &ipkl)); - result = dns_zone_setparentals(zone, ipkl.addrs, - ipkl.keys, ipkl.tlss, - ipkl.count); + dns_zone_setparentals(zone, ipkl.addrs, ipkl.keys, + ipkl.tlss, ipkl.count); dns_ipkeylist_clear(mctx, &ipkl); - RETERR(result); } else { - RETERR(dns_zone_setparentals(zone, NULL, NULL, NULL, - 0)); + dns_zone_setparentals(zone, NULL, NULL, NULL, 0); } } @@ -1906,17 +1901,13 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig, RETERR(named_config_getipandkeylist(config, "primaries", obj, mctx, &ipkl)); - result = dns_zone_setprimaries(mayberaw, ipkl.addrs, - ipkl.keys, ipkl.tlss, - ipkl.count); + dns_zone_setprimaries(mayberaw, ipkl.addrs, ipkl.keys, + ipkl.tlss, ipkl.count); count = ipkl.count; dns_ipkeylist_clear(mctx, &ipkl); - RETERR(result); } else { - result = dns_zone_setprimaries(mayberaw, NULL, NULL, - NULL, 0); + dns_zone_setprimaries(mayberaw, NULL, NULL, NULL, 0); } - RETERR(result); multi = false; if (count > 1) { diff --git a/lib/dns/include/dns/zone.h b/lib/dns/include/dns/zone.h index 5bf5a5e5660..da3ebc8a6e3 100644 --- a/lib/dns/include/dns/zone.h +++ b/lib/dns/include/dns/zone.h @@ -639,7 +639,7 @@ dns_zone_maintenance(dns_zone_t *zone); *\li 'zone' to be a valid zone. */ -isc_result_t +void dns_zone_setprimaries(dns_zone_t *zone, const isc_sockaddr_t *primaries, dns_name_t **keynames, dns_name_t **tlsnames, uint32_t count); @@ -660,7 +660,7 @@ dns_zone_setprimaries(dns_zone_t *zone, const isc_sockaddr_t *primaries, *\li Any result dns_name_dup() can return, if keynames!=NULL */ -isc_result_t +void dns_zone_setparentals(dns_zone_t *zone, const isc_sockaddr_t *parentals, dns_name_t **keynames, dns_name_t **tlsnames, uint32_t count); @@ -681,7 +681,7 @@ dns_zone_setparentals(dns_zone_t *zone, const isc_sockaddr_t *parentals, *\li Any result dns_name_dup() can return, if keynames!=NULL */ -isc_result_t +void dns_zone_setparentals(dns_zone_t *zone, const isc_sockaddr_t *parentals, dns_name_t **keynames, dns_name_t **tlsnames, uint32_t count); @@ -702,7 +702,7 @@ dns_zone_setparentals(dns_zone_t *zone, const isc_sockaddr_t *parentals, *\li Any result dns_name_dup() can return, if keynames!=NULL */ -isc_result_t +void dns_zone_setalsonotify(dns_zone_t *zone, const isc_sockaddr_t *notify, const isc_dscp_t *dscps, dns_name_t **keynames, dns_name_t **tlsnames, uint32_t count); diff --git a/lib/dns/zone.c b/lib/dns/zone.c index df3195fe91a..163ccb3c25f 100644 --- a/lib/dns/zone.c +++ b/lib/dns/zone.c @@ -1342,12 +1342,9 @@ zone_free(dns_zone_t *zone) { dns_catz_catzs_detach(&zone->catzs); } zone_freedbargs(zone); - RUNTIME_CHECK(dns_zone_setparentals(zone, NULL, NULL, NULL, 0) == - ISC_R_SUCCESS); - RUNTIME_CHECK(dns_zone_setprimaries(zone, NULL, NULL, NULL, 0) == - ISC_R_SUCCESS); - RUNTIME_CHECK(dns_zone_setalsonotify(zone, NULL, NULL, NULL, NULL, 0) == - ISC_R_SUCCESS); + dns_zone_setparentals(zone, NULL, NULL, NULL, 0); + dns_zone_setprimaries(zone, NULL, NULL, NULL, 0); + dns_zone_setalsonotify(zone, NULL, NULL, NULL, NULL, 0); zone->check_names = dns_severity_ignore; if (zone->update_acl != NULL) { dns_acl_detach(&zone->update_acl); @@ -6252,7 +6249,7 @@ clear_serverslist(isc_sockaddr_t **addrsp, isc_dscp_t **dscpsp, } } -static isc_result_t +static void set_serverslist(unsigned int count, const isc_sockaddr_t *addrs, isc_sockaddr_t **newaddrsp, const isc_dscp_t *dscp, isc_dscp_t **newdscpp, dns_name_t **keynames, @@ -6313,14 +6310,12 @@ set_serverslist(unsigned int count, const isc_sockaddr_t *addrs, *newaddrsp = newaddrs; *newkeynamesp = newkeynames; *newtlsnamesp = newtlsnames; - return (ISC_R_SUCCESS); } -isc_result_t +void dns_zone_setalsonotify(dns_zone_t *zone, const isc_sockaddr_t *notify, const isc_dscp_t *dscps, dns_name_t **keynames, dns_name_t **tlsnames, uint32_t count) { - isc_result_t result; isc_sockaddr_t *newaddrs = NULL; isc_dscp_t *newdscps = NULL; dns_name_t **newkeynames = NULL; @@ -6353,12 +6348,8 @@ dns_zone_setalsonotify(dns_zone_t *zone, const isc_sockaddr_t *notify, /* * Set up the notify and notifykey lists */ - result = set_serverslist(count, notify, &newaddrs, dscps, &newdscps, - keynames, &newkeynames, tlsnames, &newtlsnames, - zone->mctx); - if (result != ISC_R_SUCCESS) { - goto unlock; - } + set_serverslist(count, notify, &newaddrs, dscps, &newdscps, keynames, + &newkeynames, tlsnames, &newtlsnames, zone->mctx); /* * Everything is ok so attach to the zone. @@ -6370,14 +6361,12 @@ dns_zone_setalsonotify(dns_zone_t *zone, const isc_sockaddr_t *notify, zone->notifycnt = count; unlock: UNLOCK_ZONE(zone); - return (ISC_R_SUCCESS); } -isc_result_t +void dns_zone_setprimaries(dns_zone_t *zone, const isc_sockaddr_t *primaries, dns_name_t **keynames, dns_name_t **tlsnames, uint32_t count) { - isc_result_t result = ISC_R_SUCCESS; isc_sockaddr_t *newaddrs = NULL; isc_dscp_t *newdscps = NULL; dns_name_t **newkeynames = NULL; @@ -6441,14 +6430,9 @@ dns_zone_setprimaries(dns_zone_t *zone, const isc_sockaddr_t *primaries, /* * Now set up the primaries and primary key lists */ - result = set_serverslist(count, primaries, &newaddrs, NULL, &newdscps, - keynames, &newkeynames, tlsnames, &newtlsnames, - zone->mctx); + set_serverslist(count, primaries, &newaddrs, NULL, &newdscps, keynames, + &newkeynames, tlsnames, &newtlsnames, zone->mctx); INSIST(newdscps == NULL); - if (result != ISC_R_SUCCESS) { - isc_mem_put(zone->mctx, newok, count * sizeof(*newok)); - goto unlock; - } /* * Everything is ok so attach to the zone. @@ -6464,10 +6448,9 @@ dns_zone_setprimaries(dns_zone_t *zone, const isc_sockaddr_t *primaries, unlock: UNLOCK_ZONE(zone); - return (result); } -isc_result_t +void dns_zone_setparentals(dns_zone_t *zone, const isc_sockaddr_t *parentals, dns_name_t **keynames, dns_name_t **tlsnames, uint32_t count) { @@ -6499,9 +6482,8 @@ dns_zone_setparentals(dns_zone_t *zone, const isc_sockaddr_t *parentals, /* * Now set up the parentals and parental key lists */ - result = set_serverslist(count, parentals, &newaddrs, NULL, &newdscps, - keynames, &newkeynames, tlsnames, &newtlsnames, - zone->mctx); + set_serverslist(count, parentals, &newaddrs, NULL, &newdscps, keynames, + &newkeynames, tlsnames, &newtlsnames, zone->mctx); INSIST(newdscps == NULL); if (result != ISC_R_SUCCESS) { goto unlock; @@ -6520,7 +6502,6 @@ dns_zone_setparentals(dns_zone_t *zone, const isc_sockaddr_t *parentals, unlock: UNLOCK_ZONE(zone); - return (result); } isc_result_t -- 2.47.3