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

diff --git a/lib/dns/ecdb.c b/lib/dns/ecdb.c
index 1f4b3adc95d4599569e92948c97672b428e0e384..6a5a2c90d286c18123f7ea6d7600395daa8e5daa 100644 (file)
--- 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