From: Ondřej Surý <ondrej@isc.org>
Date: Wed, 30 Nov 2022 10:33:33 +0000 (+0100)
Subject: Remove dead code from dns_cache_flush()
X-Git-Tag: v9.19.8~11^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=715343c31d778910122fde998d7231cc333c5e0e;p=thirdparty%2Fbind9.git

Remove dead code from dns_cache_flush()

After removing the cache cleaning mechanism, we don't need to db
iterator in dns_cache_flush() anymore.
---

diff --git a/lib/dns/cache.c b/lib/dns/cache.c
index 3faa5f0ae0d..d905cdd888f 100644
--- a/lib/dns/cache.c
+++ b/lib/dns/cache.c
@@ -369,7 +369,6 @@ dns_cache_getservestalerefresh(dns_cache_t *cache) {
 isc_result_t
 dns_cache_flush(dns_cache_t *cache) {
 	dns_db_t *db = NULL, *olddb;
-	dns_dbiterator_t *dbiterator = NULL, *olddbiterator = NULL;
 	isc_result_t result;
 
 	result = cache_create_db(cache, &db);
@@ -377,24 +376,12 @@ dns_cache_flush(dns_cache_t *cache) {
 		return (result);
 	}
 
-	result = dns_db_createiterator(db, false, &dbiterator);
-	if (result != ISC_R_SUCCESS) {
-		dns_db_detach(&db);
-		return (result);
-	}
-
 	LOCK(&cache->lock);
 	olddb = cache->db;
 	cache->db = db;
 	dns_db_setcachestats(cache->db, cache->stats);
 	UNLOCK(&cache->lock);
 
-	if (dbiterator != NULL) {
-		dns_dbiterator_destroy(&dbiterator);
-	}
-	if (olddbiterator != NULL) {
-		dns_dbiterator_destroy(&olddbiterator);
-	}
 	dns_db_detach(&olddb);
 
 	return (ISC_R_SUCCESS);