Remove dns_rdataset_equals as unneeded

diff --git a/lib/dns/include/dns/rdataset.h b/lib/dns/include/dns/rdataset.h
index b227c73f440facee464ea9e10d67d6353a0fc546..a03897e7643defab7ee526b160d906acb287212d 100644 (file)
--- a/lib/dns/include/dns/rdataset.h
+++ b/lib/dns/include/dns/rdataset.h
@@ -87,8 +87,6 @@ struct dns_rdatasetmethods {
        isc_result_t (*addglue)(dns_rdataset_t  *rdataset,
                                dns_dbversion_t *version, dns_message_t *msg);
        dns_slabheader_t *(*getheader)(const dns_rdataset_t *rdataset);
-       bool (*equals)(const dns_rdataset_t *rdataset1,
-                      const dns_rdataset_t *rdataset2);
 };
 
 #define DNS_RDATASET_MAGIC     ISC_MAGIC('D', 'N', 'S', 'R')
@@ -634,17 +632,6 @@ dns_rdataset_getheader(const dns_rdataset_t *rdataset);
  * \li 'rdataset' is a valid rdataset.
  */
 
-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.
- */
-
 /*%
  * Returns true if the rdataset is of type 'type', or type RRSIG
  * and covers 'type'.

diff --git a/lib/dns/rdataset.c b/lib/dns/rdataset.c
index 3f411e49160f7e2509ff26a28ffd9f2c21e994b1..83a08ff4690e79595fe70724e37410868373fbc6 100644 (file)
--- a/lib/dns/rdataset.c
+++ b/lib/dns/rdataset.c
@@ -613,18 +613,3 @@ dns_rdataset_getheader(const dns_rdataset_t *rdataset) {
 
        return NULL;
 }
-
-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 af7efb3591d97c284315be8a5caa74a43ef0c450..ee9b5f6a4c751ac0cd61c9412963eb39e200862f 100644 (file)
--- a/lib/dns/rdataslab.c
+++ b/lib/dns/rdataslab.c
@@ -79,9 +79,6 @@ static void
 rdataset_getownercase(const dns_rdataset_t *rdataset, dns_name_t *name);
 static dns_slabheader_t *
 rdataset_getheader(const dns_rdataset_t *rdataset);
-static bool
-rdataset_equals(const dns_rdataset_t *rdataset1,
-               const dns_rdataset_t *rdataset2);
 
 dns_rdatasetmethods_t dns_rdataslab_rdatasetmethods = {
        .disassociate = rdataset_disassociate,
@@ -98,7 +95,6 @@ dns_rdatasetmethods_t dns_rdataslab_rdatasetmethods = {
        .setownercase = rdataset_setownercase,
        .getownercase = rdataset_getownercase,
        .getheader = rdataset_getheader,
-       .equals = rdataset_equals,
 };
 
 /*% Note: the "const void *" are just to make qsort happy.  */
@@ -1199,22 +1195,6 @@ rdataset_getheader(const dns_rdataset_t *rdataset) {
        return header - 1;
 }
 
-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;
-       }
-
-       dns_slabheader_t *header1 = (dns_slabheader_t *)rdataset1->slab.raw - 1;
-       dns_slabheader_t *header2 = (dns_slabheader_t *)rdataset2->slab.raw - 1;
-
-       return dns_rdataslab_equalx(header1, header2, rdataset1->rdclass,
-                                   rdataset2->type);
-}
-
 dns_slabtop_t *
 dns_slabtop_new(isc_mem_t *mctx, dns_typepair_t typepair) {
        dns_slabtop_t *top = isc_mem_get(mctx, sizeof(*top));