From 877e36d493d772e3bb342c342d99f8d655010d5d Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 21 Nov 2023 15:25:56 +0000 Subject: [PATCH] Make static analysis tools happier about peerDigestLookup() (#1593) Some tools thought that `key` could be nil. Refactor a bit to convince them otherwise. --- src/neighbors.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/neighbors.cc b/src/neighbors.cc index 54835f9128..a2719f628f 100644 --- a/src/neighbors.cc +++ b/src/neighbors.cc @@ -707,9 +707,9 @@ peerDigestLookup(CachePeer * p, PeerSelector * ps) #if USE_CACHE_DIGESTS assert(ps); HttpRequest *request = ps->request; - const cache_key *key = request ? storeKeyPublicByRequest(request) : nullptr; - assert(p); assert(request); + + assert(p); debugs(15, 5, "cache_peer " << *p); /* does the peeer have a valid digest? */ @@ -732,7 +732,7 @@ peerDigestLookup(CachePeer * p, PeerSelector * ps) assert(p->digest->cd); /* does digest predict a hit? */ - if (!p->digest->cd->contains(key)) + if (!p->digest->cd->contains(storeKeyPublicByRequest(request))) return LOOKUP_MISS; debugs(15, 5, "HIT for cache_peer " << *p); -- 2.47.2