From: Petr Špaček <pspacek@isc.org>
Date: Thu, 10 Jul 2025 07:47:47 +0000 (+0200)
Subject: Remove unused DNS_RDATASET_COUNT
X-Git-Tag: v9.21.11~55^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a5a25729ce64b96196e71a1d864b003ded3d12a;p=thirdparty%2Fbind9.git

Remove unused DNS_RDATASET_COUNT

Albeit technically not unused, it was always defined as 0 and thus did
nothing.

Related: #4666
---

diff --git a/lib/dns/include/dns/rdataset.h b/lib/dns/include/dns/rdataset.h
index 45e241348be..527557204af 100644
--- a/lib/dns/include/dns/rdataset.h
+++ b/lib/dns/include/dns/rdataset.h
@@ -55,12 +55,7 @@
 #include <dns/types.h>
 
 #define DNS_RDATASET_MAXADDITIONAL 13
-
-/* Fixed RRSet helper macros */
-
-#define DNS_RDATASET_LENGTH 2;
-
-#define DNS_RDATASET_COUNT 0
+#define DNS_RDATASET_LENGTH	   2;
 
 typedef enum {
 	dns_rdatasetadditional_fromauth,
diff --git a/lib/dns/qpzone.c b/lib/dns/qpzone.c
index 7056d717683..39b0caf2f7e 100644
--- a/lib/dns/qpzone.c
+++ b/lib/dns/qpzone.c
@@ -1133,7 +1133,7 @@ setnsec3parameters(dns_db_t *db, qpz_version_t *version) {
 			 */
 			raw = dns_slabheader_raw(header);
 			count = raw[0] * 256 + raw[1]; /* count */
-			raw += DNS_RDATASET_COUNT + DNS_RDATASET_LENGTH;
+			raw += DNS_RDATASET_LENGTH;
 			while (count-- > 0U) {
 				length = raw[0] * 256 + raw[1];
 				raw += DNS_RDATASET_LENGTH;
@@ -2635,7 +2635,7 @@ matchparams(dns_slabheader_t *header, qpz_search_t *search) {
 
 	raw = (unsigned char *)header + sizeof(*header);
 	count = raw[0] * 256 + raw[1]; /* count */
-	raw += DNS_RDATASET_COUNT + DNS_RDATASET_LENGTH;
+	raw += DNS_RDATASET_LENGTH;
 
 	while (count-- > 0) {
 		rdlen = raw[0] * 256 + raw[1];