From d128656d2e8a868b7c0c44e22a7410c9b39ddce8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Tue, 8 Mar 2022 11:30:37 +0100 Subject: [PATCH] Make dns_catz_get_iterator() return void Previously, the function(s) in the commit subject could fail for various reasons - mostly allocation failures, or other functions returning different return code than ISC_R_SUCCESS. Now, the aforementioned function(s) cannot ever fail and they would always return ISC_R_SUCCESS. Change the function(s) to return void and remove the extra checks in the code that uses them. --- bin/named/server.c | 8 +------- lib/dns/catz.c | 5 ++--- lib/dns/include/dns/catz.h | 5 +---- 3 files changed, 4 insertions(+), 14 deletions(-) diff --git a/bin/named/server.c b/bin/named/server.c index ec13211705..2c5cc4253f 100644 --- a/bin/named/server.c +++ b/bin/named/server.c @@ -3027,13 +3027,7 @@ configure_catz_zone(dns_view_t *view, dns_view_t *pview, * We have to walk through all the member zones and attach * them to current view */ - result = dns_catz_get_iterator(zone, &it); - if (result != ISC_R_SUCCESS) { - cfg_obj_log(catz_obj, named_g_lctx, - DNS_CATZ_ERROR_LEVEL, - "catz: unable to create iterator"); - goto cleanup; - } + dns_catz_get_iterator(zone, &it); for (result = isc_ht_iter_first(it); result == ISC_R_SUCCESS; result = isc_ht_iter_next(it)) diff --git a/lib/dns/catz.c b/lib/dns/catz.c index 7a906e12cb..393d8454a5 100644 --- a/lib/dns/catz.c +++ b/lib/dns/catz.c @@ -2025,10 +2025,9 @@ dns_catz_postreconfig(dns_catz_zones_t *catzs) { isc_ht_iter_destroy(&iter); } -isc_result_t +void dns_catz_get_iterator(dns_catz_zone_t *catz, isc_ht_iter_t **itp) { REQUIRE(DNS_CATZ_ZONE_VALID(catz)); - isc_ht_iter_create(catz->entries, itp); - return (ISC_R_SUCCESS); + isc_ht_iter_create(catz->entries, itp); } diff --git a/lib/dns/include/dns/catz.h b/lib/dns/include/dns/catz.h index 960520080b..78bdbde7a5 100644 --- a/lib/dns/include/dns/catz.h +++ b/lib/dns/include/dns/catz.h @@ -456,7 +456,7 @@ dns_catz_postreconfig(dns_catz_zones_t *catzs); * \li 'catzs' is a valid dns_catz_zones_t. */ -isc_result_t +void dns_catz_get_iterator(dns_catz_zone_t *catz, isc_ht_iter_t **itp); /*%< * Get the hashtable iterator on catalog zone members, point '*itp' to it. @@ -465,9 +465,6 @@ dns_catz_get_iterator(dns_catz_zone_t *catz, isc_ht_iter_t **itp); * \li 'catzs' is a valid dns_catz_zones_t. * \li 'itp' is not NULL and '*itp' is NULL. * - * Returns: - * \li #ISC_R_SUCCESS -- success - * \li Any other value -- failure */ ISC_LANG_ENDDECLS