Apply the semantic patch to use dns_name_empty()

Replace the easy dns_name_countlabels == 0 and > 0 occurrences with
dns_name_empty() using the semantic patch from the previous commit.

diff --git a/bin/plugins/filter-a.c b/bin/plugins/filter-a.c
index 695ada250409976d6f3ccf6198402a1546061d47..2070feb6a32faa6c22f00e6d84525aea6e52a0b5 100644 (file)
--- a/bin/plugins/filter-a.c
+++ b/bin/plugins/filter-a.c
@@ -687,9 +687,7 @@ filter_respond_begin(void *arg, void *cbdata, isc_result_t *resp) {
                dns_fixedname_t tfoundname;
                dns_rdataset_t *trdataset;
 
-               if (dns_name_countlabels(
-                           dns_fixedname_name(&qctx->foundname)) == 0)
-               {
+               if (dns_name_empty(dns_fixedname_name(&qctx->foundname))) {
                        return NS_HOOK_CONTINUE;
                }
 

diff --git a/bin/plugins/filter-aaaa.c b/bin/plugins/filter-aaaa.c
index 56b2bf1fbd8874815624b5ba4943d1d863d94b6c..187d41452560bd7552fbf74dbcefae2bd823c324 100644 (file)
--- a/bin/plugins/filter-aaaa.c
+++ b/bin/plugins/filter-aaaa.c
@@ -691,9 +691,7 @@ filter_respond_begin(void *arg, void *cbdata, isc_result_t *resp) {
                dns_fixedname_t tfoundname;
                dns_rdataset_t *trdataset;
 
-               if (dns_name_countlabels(
-                           dns_fixedname_name(&qctx->foundname)) == 0)
-               {
+               if (dns_name_empty(dns_fixedname_name(&qctx->foundname))) {
                        return NS_HOOK_CONTINUE;
                }
 

diff --git a/lib/dns/catz.c b/lib/dns/catz.c
index 7d93a1eee86b8c15e0b68de512ef46e3d20b330e..59ebecf3784432d8de2303775dfa8b4253b48dde 100644 (file)
--- a/lib/dns/catz.c
+++ b/lib/dns/catz.c
@@ -1268,14 +1268,14 @@ catz_process_coo(dns_catz_zone_t *catz, dns_label_t *mhash,
 
        RETERR(dns_rdata_tostruct(&rdata, &ptr, NULL));
 
-       if (dns_name_countlabels(&ptr.ptr) == 0) {
+       if (dns_name_empty(&ptr.ptr)) {
                CLEANUP(ISC_R_FAILURE);
        }
 
        CHECK(isc_ht_find(catz->entries, mhash->base, mhash->length,
                          (void **)&entry));
 
-       if (dns_name_countlabels(&entry->name) == 0) {
+       if (dns_name_empty(&entry->name)) {
                CLEANUP(ISC_R_FAILURE);
        }
 
@@ -1318,7 +1318,7 @@ catz_process_zones_entry(dns_catz_zone_t *catz, dns_rdataset_t *value,
        result = isc_ht_find(catz->entries, mhash->base, mhash->length,
                             (void **)&entry);
        if (result == ISC_R_SUCCESS) {
-               if (dns_name_countlabels(&entry->name) != 0) {
+               if (!dns_name_empty(&entry->name)) {
                        /* We have a duplicate. */
                        dns_rdata_freestruct(&ptr);
                        return ISC_R_FAILURE;

diff --git a/lib/dns/masterdump.c b/lib/dns/masterdump.c
index 5ad7c7c894d4e70f6302d7b0631f8c867e56d823..ad321f79f850c25719c2bef0eed147ba53523f69 100644 (file)
--- a/lib/dns/masterdump.c
+++ b/lib/dns/masterdump.c
@@ -883,7 +883,7 @@ dns_rdataset_totext(dns_rdataset_t *rdataset, const dns_name_t *owner_name,
         * file and this rdataset has the same name as the
         * previous one.)
         */
-       if (dns_name_countlabels(owner_name) == 0) {
+       if (dns_name_empty(owner_name)) {
                owner_name = NULL;
        }
 

diff --git a/lib/dns/nsec3.c b/lib/dns/nsec3.c
index 5d1fe87f07324e9c2a7ef7815a71ba448bf73153..f2fe79a55b7f17c3012fc2612503028e551e0d94 100644 (file)
--- a/lib/dns/nsec3.c
+++ b/lib/dns/nsec3.c
@@ -1844,9 +1844,7 @@ dns_nsec3_noexistnodata(dns_rdatatype_t type, const dns_name_t *name,
        /*
         * Is this zone the same or deeper than the current zone?
         */
-       if (dns_name_countlabels(zonename) == 0 ||
-           dns_name_issubdomain(zone, zonename))
-       {
+       if (dns_name_empty(zonename) || dns_name_issubdomain(zone, zonename)) {
                dns_name_copy(zone, zonename);
        }
 
@@ -1985,7 +1983,7 @@ dns_nsec3_noexistnodata(dns_rdatatype_t type, const dns_name_t *name,
                 */
                if (order == 0) {
                        if (closest != NULL &&
-                           (dns_name_countlabels(closest) == 0 ||
+                           (dns_name_empty(closest) ||
                             dns_name_issubdomain(qname, closest)) &&
                            !dns_nsec3_typepresent(&rdata, dns_rdatatype_ds) &&
                            !dns_nsec3_typepresent(&rdata,
@@ -2029,7 +2027,7 @@ dns_nsec3_noexistnodata(dns_rdatatype_t type, const dns_name_t *name,
                                 "name does not exist: '%s'",
                                 namebuf);
                        if (nearest != NULL &&
-                           (dns_name_countlabels(nearest) == 0 ||
+                           (dns_name_empty(nearest) ||
                             dns_name_issubdomain(nearest, qname)))
                        {
                                dns_name_copy(qname, nearest);

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index 61b130e312d6c2243801ca7d1d14b3cced4abead..57b26e68645eaead87c2a0b2be287b9807f58c69 100644 (file)
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -9580,7 +9580,7 @@ rctx_referral(respctx_t *rctx) {
         * XXXRTH  We should check if we're in forward-only mode, and
         *              if so we should bail out.
         */
-       INSIST(dns_name_countlabels(fctx->domain) > 0);
+       INSIST(!dns_name_empty(fctx->domain));
        fcount_decr(fctx);
 
        dns_delegset_detach(&fctx->delegset);

diff --git a/lib/dns/tkey.c b/lib/dns/tkey.c
index b57477c00a538177918f02ed107f69a0b15e5403..7a3e0f6b0b08eb16f62f7cf761a722b0f4cbceed 100644 (file)
--- a/lib/dns/tkey.c
+++ b/lib/dns/tkey.c
@@ -192,7 +192,7 @@ process_gsstkey(dns_message_t *msg, dns_name_t *name, dns_rdata_tkey_t *tkeyin,
         * rejected in dst_gssapi_acceptctx(), so if we reach here the
         * negotiation is complete and the principal must be set.
         */
-       if (dns_name_countlabels(principal) == 0U) {
+       if (dns_name_empty(principal)) {
                tkeyout->error = dns_tsigerror_badkey;
                tkey_log("process_gsstkey(): "
                         "completed context with empty principal");

diff --git a/lib/dns/validator.c b/lib/dns/validator.c
index e6ee370a175ba538259b58ace5c302e3862c18db..8a98f59eefea1653c08b3d91cdd7bbeabded125c 100644 (file)
--- a/lib/dns/validator.c
+++ b/lib/dns/validator.c
@@ -2813,7 +2813,7 @@ checkwildcard(dns_validator_t *val, dns_rdatatype_t type,
        dns_rdataset_init(&trdataset);
        wild = dns_fixedname_name(&val->wild);
 
-       if (dns_name_countlabels(wild) == 0) {
+       if (dns_name_empty(wild)) {
                validator_log(val, ISC_LOG_DEBUG(3),
                              "in checkwildcard: no wildcard to check");
                return ISC_R_SUCCESS;
@@ -2933,7 +2933,7 @@ findnsec3proofs(dns_validator_t *val) {
                        CLEANUP(result);
                }
        }
-       if (dns_name_countlabels(zonename) == 0) {
+       if (dns_name_empty(zonename)) {
                CLEANUP(ISC_R_SUCCESS);
        }
 
@@ -2941,7 +2941,7 @@ findnsec3proofs(dns_validator_t *val) {
         * If the val->closest is set then we want to use it otherwise
         * we need to discover it.
         */
-       if (dns_name_countlabels(dns_fixedname_name(&val->closest)) != 0) {
+       if (!dns_name_empty(dns_fixedname_name(&val->closest))) {
                char namebuf[DNS_NAME_FORMATSIZE];
 
                dns_name_format(dns_fixedname_name(&val->closest), namebuf,
@@ -3025,11 +3025,11 @@ findnsec3proofs(dns_validator_t *val) {
         * at proofs from the parent zone.
         */
        dns_name_t *wildsigner = dns_fixedname_name(&val->wildsigner);
-       if (dns_name_countlabels(closest) > 0 &&
+       if (!dns_name_empty(closest) &&
            dns_name_countlabels(nearest) ==
                    dns_name_countlabels(closest) + 1 &&
            dns_name_issubdomain(nearest, closest) &&
-           (dns_name_countlabels(wildsigner) == 0 ||
+           (dns_name_empty(wildsigner) ||
             dns_name_equal(zonename, wildsigner)))
        {
                val->attributes |= VALATTR_FOUNDCLOSEST;
@@ -3271,8 +3271,7 @@ validate_nx(dns_validator_t *val, bool resume) {
                        marksecure(val, "validate_nx (noqname proof found)");
                        return ISC_R_SUCCESS;
                } else if (FOUNDOPTOUT(val) &&
-                          dns_name_countlabels(
-                                  dns_fixedname_name(&val->wild)) != 0)
+                          !dns_name_empty(dns_fixedname_name(&val->wild)))
                {
                        validator_log(val, ISC_LOG_DEBUG(3),
                                      "optout proof found");

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 78f40729708c228604b7544c1dd13ef7d49e8301..ac21cf5ac3ff8ba8b31dd7057729cf5062e20cf6 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -2348,7 +2348,7 @@ integrity_checks(dns_zone_t *zone, dns_db_t *db) {
                 * Is this name visible in the zone?
                 */
                if (!dns_name_issubdomain(name, &zone->origin) ||
-                   (dns_name_countlabels(bottom) > 0 &&
+                   (!dns_name_empty(bottom) &&
                     dns_name_issubdomain(name, bottom)))
                {
                        goto next;

diff --git a/lib/ns/query.c b/lib/ns/query.c
index 4a8d44d16a18d305aa31aba942430e767fb1998a..f9e662d25d6d36d3eae6d8e0a92179264bfbc765 100644 (file)
--- a/lib/ns/query.c
+++ b/lib/ns/query.c
@@ -9393,7 +9393,7 @@ checksignames(dns_name_t *signer, dns_rdataset_t *sigrdataset) {
                result = dns_rdata_tostruct(&rdata, &rrsig, NULL);
                RUNTIME_CHECK(result == ISC_R_SUCCESS);
 
-               if (dns_name_countlabels(signer) == 0) {
+               if (dns_name_empty(signer)) {
                        dns_name_copy(&rrsig.signer, signer);
                } else if (!dns_name_equal(signer, &rrsig.signer)) {
                        return ISC_R_FAILURE;