From: Mark Andrews <marka@isc.org>
Date: Thu, 4 Sep 2025 00:02:43 +0000 (+1000)
Subject: Remove dns_rdataset_equals as unneeded
X-Git-Tag: v9.18.41~16^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f866f7a1e8e40750eb0629a2e112c5e7b122d3e9;p=thirdparty%2Fbind9.git

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 fec02474cf8..caa49c5845a 100644
--- a/lib/dns/include/dns/rdataset.h
+++ b/lib/dns/include/dns/rdataset.h
@@ -86,8 +86,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')
@@ -631,14 +629,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/keytable.c b/lib/dns/keytable.c
index 215afa340b4..bab4db0a750 100644
--- a/lib/dns/keytable.c
+++ b/lib/dns/keytable.c
@@ -91,7 +91,6 @@ static dns_rdatasetmethods_t methods = {
 	NULL,
 	NULL,
 	NULL, /* addglue */
-	NULL, /* equals */
 };
 
 static void
diff --git a/lib/dns/ncache.c b/lib/dns/ncache.c
index 4018aa97382..c99c2665aec 100644
--- a/lib/dns/ncache.c
+++ b/lib/dns/ncache.c
@@ -525,7 +525,6 @@ static dns_rdatasetmethods_t rdataset_methods = {
 	NULL,		   /* setownercase */
 	NULL,		   /* getownercase */
 	NULL,		   /* addglue */
-	NULL,		   /* equals */
 };
 
 isc_result_t
diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c
index 8fedf2cff9f..82cb74db260 100644
--- a/lib/dns/rbtdb.c
+++ b/lib/dns/rbtdb.c
@@ -610,9 +610,6 @@ rdataset_getownercase(const dns_rdataset_t *rdataset, dns_name_t *name);
 static isc_result_t
 rdataset_addglue(dns_rdataset_t *rdataset, dns_dbversion_t *version,
 		 dns_message_t *msg);
-static bool
-rdataset_equals(const dns_rdataset_t *rdataset1,
-		const dns_rdataset_t *rdataset2);
 static void
 free_gluetable(rbtdb_version_t *version);
 static isc_result_t
@@ -633,8 +630,7 @@ static dns_rdatasetmethods_t rdataset_methods = { rdataset_disassociate,
 						  rdataset_clearprefetch,
 						  rdataset_setownercase,
 						  rdataset_getownercase,
-						  rdataset_addglue,
-						  rdataset_equals };
+						  rdataset_addglue };
 
 static dns_rdatasetmethods_t slab_methods = {
 	rdataset_disassociate,
@@ -653,7 +649,6 @@ static dns_rdatasetmethods_t slab_methods = {
 	NULL, /* setownercase */
 	NULL, /* getownercase */
 	NULL, /* addglue */
-	NULL, /* equals */
 };
 
 static void
@@ -10407,23 +10402,6 @@ no_glue:
 	/* UNREACHABLE */
 }
 
-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;
-	}
-
-	uint8_t *header1 = (uint8_t *)rdataset1->private3 -
-			   sizeof(rdatasetheader_t);
-	uint8_t *header2 = (uint8_t *)rdataset2->private3 -
-			   sizeof(rdatasetheader_t);
-	return dns_rdataslab_equalx(header1, header2, sizeof(rdatasetheader_t),
-				    rdataset1->rdclass, rdataset2->type);
-}
-
 /*%
  * Routines for LRU-based cache management.
  */
diff --git a/lib/dns/rdatalist.c b/lib/dns/rdatalist.c
index 5cccea51498..98036f9cb32 100644
--- a/lib/dns/rdatalist.c
+++ b/lib/dns/rdatalist.c
@@ -43,7 +43,6 @@ static dns_rdatasetmethods_t methods = {
 	isc__rdatalist_setownercase,
 	isc__rdatalist_getownercase,
 	NULL, /* addglue */
-	NULL, /* equals */
 };
 
 void
diff --git a/lib/dns/rdataset.c b/lib/dns/rdataset.c
index 67508716d7b..e190156fa73 100644
--- a/lib/dns/rdataset.c
+++ b/lib/dns/rdataset.c
@@ -197,7 +197,6 @@ static dns_rdatasetmethods_t question_methods = {
 	NULL, /* setownercase */
 	NULL, /* getownercase */
 	NULL, /* addglue */
-	NULL, /* equals */
 };
 
 void
@@ -753,18 +752,3 @@ dns_rdataset_addglue(dns_rdataset_t *rdataset, dns_dbversion_t *version,
 
 	return (rdataset->methods->addglue)(rdataset, version, msg);
 }
-
-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/sdb.c b/lib/dns/sdb.c
index 40fe6f7ab2b..b29931e6626 100644
--- a/lib/dns/sdb.c
+++ b/lib/dns/sdb.c
@@ -1440,7 +1440,6 @@ static dns_rdatasetmethods_t sdb_rdataset_methods = {
 	NULL, /* setownercase */
 	NULL, /* getownercase */
 	NULL, /* addglue */
-	NULL, /* equals */
 };
 
 static void
diff --git a/lib/dns/sdlz.c b/lib/dns/sdlz.c
index ebd7fdd50b6..259d7687970 100644
--- a/lib/dns/sdlz.c
+++ b/lib/dns/sdlz.c
@@ -1452,7 +1452,6 @@ static dns_rdatasetmethods_t rdataset_methods = {
 	NULL, /* setownercase */
 	NULL, /* getownercase */
 	NULL, /* addglue */
-	NULL, /* equals */
 };
 
 static void