From 91cc6b9eb9242da5eb188462725b3553fd372360 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Fri, 27 Sep 2019 09:55:19 +0200 Subject: [PATCH] lib/dns/ecdb.c: Fix couple of DbC conditions reported by Cppcheck --- lib/dns/ecdb.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/lib/dns/ecdb.c b/lib/dns/ecdb.c index 1f4b3adc95..6a5a2c90d2 100644 --- a/lib/dns/ecdb.c +++ b/lib/dns/ecdb.c @@ -760,28 +760,30 @@ rdatasetiter_destroy(dns_rdatasetiter_t **iteratorp) { static isc_result_t rdatasetiter_first(dns_rdatasetiter_t *iterator) { + REQUIRE(DNS_RDATASETITER_VALID(iterator)); + ecdb_rdatasetiter_t *ecdbiterator = (ecdb_rdatasetiter_t *)iterator; dns_ecdbnode_t *ecdbnode = (dns_ecdbnode_t *)iterator->node; - REQUIRE(DNS_RDATASETITER_VALID(iterator)); - - if (ISC_LIST_EMPTY(ecdbnode->rdatasets)) + if (ISC_LIST_EMPTY(ecdbnode->rdatasets)) { return (ISC_R_NOMORE); + } ecdbiterator->current = ISC_LIST_HEAD(ecdbnode->rdatasets); return (ISC_R_SUCCESS); } static isc_result_t rdatasetiter_next(dns_rdatasetiter_t *iterator) { - ecdb_rdatasetiter_t *ecdbiterator = (ecdb_rdatasetiter_t *)iterator; - REQUIRE(DNS_RDATASETITER_VALID(iterator)); + ecdb_rdatasetiter_t *ecdbiterator = (ecdb_rdatasetiter_t *)iterator; + ecdbiterator->current = ISC_LIST_NEXT(ecdbiterator->current, link); - if (ecdbiterator->current == NULL) + if (ecdbiterator->current == NULL) { return (ISC_R_NOMORE); - else + } else { return (ISC_R_SUCCESS); + } } static void