From: Mark Andrews <marka@isc.org>
Date: Mon, 18 Oct 2021 03:05:37 +0000 (+1100)
Subject: Remove unnecessary dns_rbt_fullnamefromnode call
X-Git-Tag: v9.17.21~5^2~32
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=27acf56ba35186f2cdf03094b5422dedc0841adb;p=thirdparty%2Fbind9.git

Remove unnecessary dns_rbt_fullnamefromnode call

the results from dns_rbt_fullnamefromnode are not used.
---

diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c
index 5814f3e6a5b..70893ee0293 100644
--- a/lib/dns/rbtdb.c
+++ b/lib/dns/rbtdb.c
@@ -1745,18 +1745,15 @@ delete_node(dns_rbtdb_t *rbtdb, dns_rbtnode_t *node) {
 
 	switch (node->nsec) {
 	case DNS_RBT_NSEC_NORMAL:
+		result = dns_rbt_deletenode(rbtdb->tree, node, false);
+		break;
+	case DNS_RBT_NSEC_HAS_NSEC:
 		/*
 		 * Though this may be wasteful, it has to be done before
 		 * node is deleted.
 		 */
 		name = dns_fixedname_initname(&fname);
 		dns_rbt_fullnamefromnode(node, name);
-
-		result = dns_rbt_deletenode(rbtdb->tree, node, false);
-		break;
-	case DNS_RBT_NSEC_HAS_NSEC:
-		name = dns_fixedname_initname(&fname);
-		dns_rbt_fullnamefromnode(node, name);
 		/*
 		 * Delete the corresponding node from the auxiliary NSEC
 		 * tree before deleting from the main tree.