From: Amos Jeffries <squid3@treenet.co.nz>
Date: Thu, 23 Feb 2017 03:50:31 +0000 (+1300)
Subject: Remove some NULL references from adaptation/icap/ModXact.cc
X-Git-Tag: M-staged-PR71~250
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=02dd083907562f868659372acc74016102456411;p=thirdparty%2Fsquid.git

Remove some NULL references from adaptation/icap/ModXact.cc

This may resolve one odd false-positive by Coverity. Gets rid of some NULL anyhow if not.
---

diff --git a/src/adaptation/icap/ModXact.cc b/src/adaptation/icap/ModXact.cc
index 9ed17fb798..b09ee26bc7 100644
--- a/src/adaptation/icap/ModXact.cc
+++ b/src/adaptation/icap/ModXact.cc
@@ -1604,12 +1604,11 @@ Adaptation::Icap::ModXact::encapsulateHead(MemBuf &icapBuf, const char *section,
         new_reply->sline = old_reply->sline;
         headClone = new_reply.getRaw();
     }
-    Must(headClone != NULL);
+    Must(headClone);
     headClone->inheritProperties(head);
 
     HttpHeaderPos pos = HttpHeaderInitPos;
-    HttpHeaderEntry* p_head_entry = NULL;
-    while (NULL != (p_head_entry = head->header.getEntry(&pos)) )
+    while (HttpHeaderEntry* p_head_entry = head->header.getEntry(&pos))
         headClone->header.addEntry(p_head_entry->clone());
 
     // end cloning