From: Evan Hunt <each@isc.org>
Date: Thu, 18 Apr 2024 23:25:48 +0000 (-0700)
Subject: clean up fix_iterator() arguments
X-Git-Tag: v9.19.24~11^2~3
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=66dbff596b223e6084c113f61293ee4f0f0caaf2;p=thirdparty%2Fbind9.git

clean up fix_iterator() arguments

the value passed as 'start' was redundant; it's always the same
as the current top of the iterator stack.
---

diff --git a/lib/dns/qp.c b/lib/dns/qp.c
index e381b7c324a..047338faa4f 100644
--- a/lib/dns/qp.c
+++ b/lib/dns/qp.c
@@ -2100,12 +2100,11 @@ anyleaf(dns_qpreader_t *qp, dns_qpnode_t *n) {
  *     the predecessor.
  */
 static dns_qpnode_t *
-fix_iterator(dns_qpreader_t *qp, dns_qpiter_t *iter, dns_qpnode_t *start,
-	     dns_qpkey_t search, size_t searchlen, dns_qpshift_t bit,
-	     size_t offset) {
+fix_iterator(dns_qpreader_t *qp, dns_qpiter_t *iter, dns_qpkey_t search,
+	     size_t searchlen, dns_qpshift_t bit, size_t offset) {
 	dns_qpkey_t found;
 	size_t foundlen, to;
-	dns_qpnode_t *n = start;
+	dns_qpnode_t *n = iter->stack[iter->sp];
 	dns_qpnode_t *leaf = anyleaf(qp, n);
 
 	foundlen = leaf_qpkey(qp, leaf, found);
@@ -2318,7 +2317,7 @@ dns_qp_lookup(dns_qpreadable_t qpr, const dns_name_t *name,
 			 * for the predecessor of the searched-for-name;
 			 * that will break the loop.
 			 */
-			n = fix_iterator(qp, iter, n, search, searchlen, bit,
+			n = fix_iterator(qp, iter, search, searchlen, bit,
 					 offset);
 			iter->stack[iter->sp--] = NULL;
 		} else {
@@ -2346,7 +2345,7 @@ dns_qp_lookup(dns_qpreadable_t qpr, const dns_name_t *name,
 		 * and if the caller passed us an iterator,
 		 * then we might need to reposition it.
 		 */
-		n = fix_iterator(qp, iter, n, search, searchlen, bit, offset);
+		n = fix_iterator(qp, iter, search, searchlen, bit, offset);
 	}
 
 	/* do the keys differ, and if so, where? */