lib/dns/ecdb.c: Fix couple of DbC conditions reported by Cppcheck

(cherry picked from commit 91cc6b9eb9242da5eb188462725b3553fd372360)

diff --git a/lib/dns/ecdb.c b/lib/dns/ecdb.c
index 796962f67d0b8388a174c012669fd2fe0e0c1135..c70c7b68b99fb4d5db2e0b0896e189d41cb117a1 100644 (file)
--- a/lib/dns/ecdb.c
+++ b/lib/dns/ecdb.c
@@ -786,28 +786,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