From: Alessio Podda <alessio@isc.org>
Date: Tue, 15 Jul 2025 10:16:39 +0000 (+0200)
Subject: Remove unused dns_slabheader_reset argument
X-Git-Tag: v9.21.12~50^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a05db4196fd854326a442e53fbb071518507ddd5;p=thirdparty%2Fbind9.git

Remove unused dns_slabheader_reset argument

As a part of the previous refactor, the db argument of
dns_slabheader_reset is now unused, and can be removed.
---

diff --git a/lib/dns/include/dns/rdataslab.h b/lib/dns/include/dns/rdataslab.h
index 2460387e64b..921c32da1f5 100644
--- a/lib/dns/include/dns/rdataslab.h
+++ b/lib/dns/include/dns/rdataslab.h
@@ -292,7 +292,7 @@ dns_slabheader_copycase(dns_slabheader_t *dest, dns_slabheader_t *src);
  */
 
 void
-dns_slabheader_reset(dns_slabheader_t *h, dns_db_t *db, dns_dbnode_t *node);
+dns_slabheader_reset(dns_slabheader_t *h, dns_dbnode_t *node);
 /*%<
  * Reset an rdataslab header 'h' so it can be used to store data in
  * database 'db' and node 'node'.
diff --git a/lib/dns/qpcache.c b/lib/dns/qpcache.c
index 0d8b9853f45..29f93355465 100644
--- a/lib/dns/qpcache.c
+++ b/lib/dns/qpcache.c
@@ -2991,7 +2991,7 @@ qpcache_addrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version,
 	dns_rdataset_getownercase(rdataset, name);
 
 	newheader = (dns_slabheader_t *)region.base;
-	dns_slabheader_reset(newheader, db, node);
+	dns_slabheader_reset(newheader, node);
 
 	/*
 	 * By default, dns_rdataslab_fromrdataset() sets newheader->ttl
diff --git a/lib/dns/qpzone.c b/lib/dns/qpzone.c
index 15163d85f9f..2140a964215 100644
--- a/lib/dns/qpzone.c
+++ b/lib/dns/qpzone.c
@@ -1965,7 +1965,6 @@ add(qpzonedb_t *qpdb, qpznode_t *node, const dns_name_t *nodename,
 				dns_slabheader_destroy(&newheader);
 				newheader = merged;
 				dns_slabheader_reset(newheader,
-						     (dns_db_t *)qpdb,
 						     (dns_dbnode_t *)node);
 				dns_slabheader_copycase(newheader, header);
 				if (loading && RESIGN(newheader) &&
@@ -2227,7 +2226,7 @@ loading_addrdataset(void *arg, const dns_name_t *name,
 	}
 
 	newheader = (dns_slabheader_t *)region.base;
-	dns_slabheader_reset(newheader, (dns_db_t *)qpdb, (dns_dbnode_t *)node);
+	dns_slabheader_reset(newheader, (dns_dbnode_t *)node);
 
 	newheader->ttl = rdataset->ttl;
 	newheader->trust = rdataset->trust;
@@ -4842,7 +4841,7 @@ qpzone_addrdataset(dns_db_t *db, dns_dbnode_t *dbnode,
 	dns_rdataset_getownercase(rdataset, name);
 
 	newheader = (dns_slabheader_t *)region.base;
-	dns_slabheader_reset(newheader, db, (dns_dbnode_t *)node);
+	dns_slabheader_reset(newheader, (dns_dbnode_t *)node);
 	newheader->ttl = rdataset->ttl;
 	if (rdataset->ttl == 0U) {
 		DNS_SLABHEADER_SETATTR(newheader, DNS_SLABHEADERATTR_ZEROTTL);
@@ -4955,7 +4954,7 @@ qpzone_subtractrdataset(dns_db_t *db, dns_dbnode_t *dbnode,
 	}
 
 	newheader = (dns_slabheader_t *)region.base;
-	dns_slabheader_reset(newheader, db, (dns_dbnode_t *)node);
+	dns_slabheader_reset(newheader, (dns_dbnode_t *)node);
 	newheader->ttl = rdataset->ttl;
 	atomic_init(&newheader->attributes, 0);
 	newheader->serial = version->serial;
@@ -5010,8 +5009,7 @@ qpzone_subtractrdataset(dns_db_t *db, dns_dbnode_t *dbnode,
 		if (result == ISC_R_SUCCESS) {
 			dns_slabheader_destroy(&newheader);
 			newheader = subresult;
-			dns_slabheader_reset(newheader, db,
-					     (dns_dbnode_t *)node);
+			dns_slabheader_reset(newheader, (dns_dbnode_t *)node);
 			dns_slabheader_copycase(newheader, header);
 			if (RESIGN(header)) {
 				DNS_SLABHEADER_SETATTR(
diff --git a/lib/dns/rdataslab.c b/lib/dns/rdataslab.c
index 2af3f3ba50a..68f5ea66962 100644
--- a/lib/dns/rdataslab.c
+++ b/lib/dns/rdataslab.c
@@ -859,7 +859,7 @@ dns_slabheader_copycase(dns_slabheader_t *dest, dns_slabheader_t *src) {
 }
 
 void
-dns_slabheader_reset(dns_slabheader_t *h, dns_db_t *db, dns_dbnode_t *node) {
+dns_slabheader_reset(dns_slabheader_t *h, dns_dbnode_t *node) {
 	ISC_LINK_INIT(h, link);
 	h->heap_index = 0;
 	h->heap = NULL;
@@ -882,7 +882,7 @@ dns_slabheader_new(dns_db_t *db, dns_dbnode_t *node) {
 	*h = (dns_slabheader_t){
 		.link = ISC_LINK_INITIALIZER,
 	};
-	dns_slabheader_reset(h, db, node);
+	dns_slabheader_reset(h, node);
 	return h;
 }