Apply more SET_IF_NOT_NULL() changes

coccinelle v1.2 found more cases where the SET_IF_NOT_NULL macro
applies.

diff --git a/bin/dnssec/dnssectool.c b/bin/dnssec/dnssectool.c
index da1fffa400f07d1f997a918a4dd05fb0d4a18661..48c09e9d48d37a99b9e9a3abbaceedcfb51c96ec 100644 (file)
--- a/bin/dnssec/dnssectool.c
+++ b/bin/dnssec/dnssectool.c
@@ -460,9 +460,7 @@ key_collision(dst_key_t *dstkey, dns_name_t *name, const char *dir,
        dns_secalg_t alg;
        isc_stdtime_t now = isc_stdtime_now();
 
-       if (exact != NULL) {
-               *exact = false;
-       }
+       SET_IF_NOT_NULL(exact, false);
 
        id = dst_key_id(dstkey);
        rid = dst_key_rid(dstkey);

diff --git a/lib/dns/message.c b/lib/dns/message.c
index 44e0c6ab7cd59d6a5cc8bfdbb5b0343b3f393b91..bb83ff41d772d247660f2f5b0164a30672f3d897 100644 (file)
--- a/lib/dns/message.c
+++ b/lib/dns/message.c
@@ -2551,9 +2551,7 @@ dns_message_findname(dns_message_t *msg, dns_section_t section,
                return result;
        }
 
-       if (name != NULL) {
-               *name = foundname;
-       }
+       SET_IF_NOT_NULL(name, foundname);
 
        /*
         * And now look for the type.

diff --git a/lib/dns/private.c b/lib/dns/private.c
index b1718fbdb1ae56e4eac02e273d6827be398eb549..b5606f6b85ac9584ef888fe0166c936321abb3e4 100644 (file)
--- a/lib/dns/private.c
+++ b/lib/dns/private.c
@@ -138,12 +138,8 @@ dns_private_chains(dns_db_t *db, dns_dbversion_t *ver,
        if (dns_rdataset_isassociated(&nsecset) &&
            dns_rdataset_isassociated(&nsec3paramset))
        {
-               if (build_nsec != NULL) {
-                       *build_nsec = true;
-               }
-               if (build_nsec3 != NULL) {
-                       *build_nsec3 = true;
-               }
+               SET_IF_NOT_NULL(build_nsec, true);
+               SET_IF_NOT_NULL(build_nsec3, true);
                goto success;
        }
 
@@ -160,12 +156,8 @@ dns_private_chains(dns_db_t *db, dns_dbversion_t *ver,
         * Look to see if we also need to be creating a NSEC3 chain.
         */
        if (dns_rdataset_isassociated(&nsecset)) {
-               if (build_nsec != NULL) {
-                       *build_nsec = true;
-               }
-               if (build_nsec3 != NULL) {
-                       *build_nsec3 = false;
-               }
+               SET_IF_NOT_NULL(build_nsec, true);
+               SET_IF_NOT_NULL(build_nsec3, false);
                if (!dns_rdataset_isassociated(&privateset)) {
                        goto success;
                }
@@ -194,12 +186,8 @@ dns_private_chains(dns_db_t *db, dns_dbversion_t *ver,
        }
 
        if (dns_rdataset_isassociated(&nsec3paramset)) {
-               if (build_nsec3 != NULL) {
-                       *build_nsec3 = true;
-               }
-               if (build_nsec != NULL) {
-                       *build_nsec = false;
-               }
+               SET_IF_NOT_NULL(build_nsec3, true);
+               SET_IF_NOT_NULL(build_nsec, false);
                if (!dns_rdataset_isassociated(&privateset)) {
                        goto success;
                }
@@ -264,12 +252,8 @@ dns_private_chains(dns_db_t *db, dns_dbversion_t *ver,
                goto success;
        }
 
-       if (build_nsec != NULL) {
-               *build_nsec = false;
-       }
-       if (build_nsec3 != NULL) {
-               *build_nsec3 = false;
-       }
+       SET_IF_NOT_NULL(build_nsec, false);
+       SET_IF_NOT_NULL(build_nsec3, false);
        if (!dns_rdataset_isassociated(&privateset)) {
                goto success;
        }

diff --git a/lib/dns/view.c b/lib/dns/view.c
index fb354d3ad7fe1233827eb04cd3560dcffdfe6a58..d2f21ee8baa8ddc9f77a8c50ef6a2feeb2e4222d 100644 (file)
--- a/lib/dns/view.c
+++ b/lib/dns/view.c
@@ -1599,9 +1599,7 @@ dns_view_issecuredomain(dns_view_t *view, const dns_name_t *name,
                return result;
        }
 
-       if (ntap != NULL) {
-               *ntap = false;
-       }
+       SET_IF_NOT_NULL(ntap, false);
        if (checknta && secure && view->ntatable_priv != NULL &&
            dns_ntatable_covered(view->ntatable_priv, now, name, anchor))
        {

diff --git a/lib/isccfg/aclconf.c b/lib/isccfg/aclconf.c
index 03030aa89892d5a83c19e7d2b17894c87ac7262f..0f382dca7bbb13778f613256a6ef60be94681551 100644 (file)
--- a/lib/isccfg/aclconf.c
+++ b/lib/isccfg/aclconf.c
@@ -209,9 +209,7 @@ count_acl_elements(const cfg_obj_t *caml, const cfg_obj_t *cctx,
 
        REQUIRE(count != NULL);
 
-       if (has_negative != NULL) {
-               *has_negative = false;
-       }
+       SET_IF_NOT_NULL(has_negative, false);
 
        for (elt = cfg_list_first(caml); elt != NULL; elt = cfg_list_next(elt))
        {