Remove dns_rdataset_equals as unneeded

(cherry picked from commit 7d765a35141882b87ffb2b41ddc3500bac8595f0)

diff --git a/lib/dns/include/dns/rdataset.h b/lib/dns/include/dns/rdataset.h
index 37e1bc689ba5fadc3cfd24f405b52aadc958d539..0dc54cf58e3d10aa4df55ccd50b4323b9b753e45 100644 (file)
--- a/lib/dns/include/dns/rdataset.h
+++ b/lib/dns/include/dns/rdataset.h
@@ -101,8 +101,6 @@ typedef struct dns_rdatasetmethods {
        void (*getownercase)(const dns_rdataset_t *rdataset, dns_name_t *name);
        isc_result_t (*addglue)(dns_rdataset_t  *rdataset,
                                dns_dbversion_t *version, dns_message_t *msg);
-       bool (*equals)(const dns_rdataset_t *rdataset1,
-                      const dns_rdataset_t *rdataset2);
 } dns_rdatasetmethods_t;
 
 #define DNS_RDATASET_MAGIC     ISC_MAGIC('D', 'N', 'S', 'R')
@@ -693,14 +691,4 @@ dns_trust_totext(dns_trust_t trust);
  * Display trust in textual form.
  */
 
-bool
-dns_rdataset_equals(const dns_rdataset_t *rdataset1,
-                   const dns_rdataset_t *rdataset2);
-/*%<
- * Returns true if the rdata in the rdataset is equal.
- *
- * Requires:
- * \li 'rdataset1' is a valid rdataset.
- * \li 'rdataset2' is a valid rdataset.
- */
 ISC_LANG_ENDDECLS

diff --git a/lib/dns/rdataset.c b/lib/dns/rdataset.c
index 1118e1531d17a10cce2c3254f951dd91cb706082..b6043ba7ea8f96b953f9716971f7f1fd4d83003f 100644 (file)
--- a/lib/dns/rdataset.c
+++ b/lib/dns/rdataset.c
@@ -676,18 +676,3 @@ dns_rdataset_trimttl(dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset,
        rdataset->ttl = ttl;
        sigrdataset->ttl = ttl;
 }
-
-bool
-dns_rdataset_equals(const dns_rdataset_t *rdataset1,
-                   const dns_rdataset_t *rdataset2) {
-       REQUIRE(DNS_RDATASET_VALID(rdataset1));
-       REQUIRE(DNS_RDATASET_VALID(rdataset2));
-
-       if (rdataset1->methods->equals != NULL &&
-           rdataset1->methods->equals == rdataset2->methods->equals)
-       {
-               return (rdataset1->methods->equals)(rdataset1, rdataset2);
-       }
-
-       return false;
-}

diff --git a/lib/dns/rdataslab.c b/lib/dns/rdataslab.c
index dd891f22b3ae0bf6555d2ba61d08aec3f07b6297..134febb4aaf17b6a8b5ddad3929961886a51d715 100644 (file)
--- a/lib/dns/rdataslab.c
+++ b/lib/dns/rdataslab.c
@@ -125,9 +125,6 @@ static void
 rdataset_setownercase(dns_rdataset_t *rdataset, const dns_name_t *name);
 static void
 rdataset_getownercase(const dns_rdataset_t *rdataset, dns_name_t *name);
-static bool
-rdataset_equals(const dns_rdataset_t *rdataset1,
-               const dns_rdataset_t *rdataset2);
 
 /*% Note: the "const void *" are just to make qsort happy.  */
 static int
@@ -1158,7 +1155,6 @@ dns_rdatasetmethods_t dns_rdataslab_rdatasetmethods = {
        .clearprefetch = rdataset_clearprefetch,
        .setownercase = rdataset_setownercase,
        .getownercase = rdataset_getownercase,
-       .equals = rdataset_equals,
 };
 
 /* Fixed RRSet helper macros */
@@ -1477,18 +1473,3 @@ rdataset_getownercase(const dns_rdataset_t *rdataset, dns_name_t *name) {
 unlock:
        dns_db_unlocknode(header->db, header->node, isc_rwlocktype_read);
 }
-
-static bool
-rdataset_equals(const dns_rdataset_t *rdataset1,
-               const dns_rdataset_t *rdataset2) {
-       if (rdataset1->rdclass != rdataset2->rdclass ||
-           rdataset1->type != rdataset2->type)
-       {
-               return false;
-       }
-
-       unsigned char *header1 = rdataset1->slab.raw - sizeof(dns_slabheader_t);
-       unsigned char *header2 = rdataset2->slab.raw - sizeof(dns_slabheader_t);
-       return dns_rdataslab_equalx(header1, header2, sizeof(dns_slabheader_t),
-                                   rdataset1->rdclass, rdataset2->type);
-}