From 04d6412558db9b608add54541c26590167042269 Mon Sep 17 00:00:00 2001 From: Evan Hunt Date: Sun, 17 Aug 2025 13:53:04 -0700 Subject: [PATCH] simplify iterator_active() the if statements calling iterator_active() checked the EXISTS flag on the header and then iterator_active() checked it again. simplify so only the caller checks it. --- lib/dns/qpcache.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/lib/dns/qpcache.c b/lib/dns/qpcache.c index 5d31550258..7613105123 100644 --- a/lib/dns/qpcache.c +++ b/lib/dns/qpcache.c @@ -3316,13 +3316,6 @@ iterator_active(qpcache_t *qpdb, qpc_rditer_t *iterator, dns_slabheader_t *header) { dns_ttl_t stale_ttl = header->expire + STALE_TTL(header, qpdb); - /* - * Is this a "this rdataset doesn't exist" record? - */ - if (!EXISTS(header)) { - return false; - } - /* * If this header is still active then return it. */ @@ -3352,8 +3345,9 @@ rdatasetiter_first(dns_rdatasetiter_t *it DNS__DB_FLARG) { NODE_RDLOCK(nlock, &nlocktype); for (top = qpnode->data; top != NULL; top = top->next) { - if ((EXPIREDOK(iterator) && EXISTS(top->header)) || - iterator_active(qpdb, iterator, top->header)) + if (EXISTS(top->header) && + (EXPIREDOK(iterator) || + iterator_active(qpdb, iterator, top->header))) { break; } @@ -3387,8 +3381,9 @@ rdatasetiter_next(dns_rdatasetiter_t *it DNS__DB_FLARG) { NODE_RDLOCK(nlock, &nlocktype); for (top = top->next; top != NULL; top = top->next) { - if ((EXPIREDOK(iterator) && EXISTS(top->header)) || - iterator_active(qpdb, iterator, top->header)) + if (EXISTS(top->header) && + (EXPIREDOK(iterator) || + iterator_active(qpdb, iterator, top->header))) { break; }