From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Thu, 6 Aug 2015 18:55:29 +0000 (+0200)
Subject: Remove always-true checks in HttpHdrCc (CID 1315405, 1315406)
X-Git-Tag: SQUID_4_0_1~144
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a242e34c9e54bcf913a86fa8f42a9c0808098374;p=thirdparty%2Fsquid.git

Remove always-true checks in HttpHdrCc (CID 1315405, 1315406)
---

diff --git a/src/HttpHdrCc.cc b/src/HttpHdrCc.cc
index 51bc2a2299..eb0a672192 100644
--- a/src/HttpHdrCc.cc
+++ b/src/HttpHdrCc.cc
@@ -293,7 +293,7 @@ std::ostream &
 operator<< (std::ostream &s, HttpHdrCcType c)
 {
     const unsigned char ic = static_cast<int>(c);
-    if (c >= HttpHdrCcType::CC_PUBLIC && c < HttpHdrCcType::CC_ENUM_END)
+    if (c < HttpHdrCcType::CC_ENUM_END)
         s << CcAttrs[ic].name << '[' << ic << ']' ;
     else
         s << "*invalid hdrcc* [" << ic << ']';
diff --git a/src/HttpHdrCc.cci b/src/HttpHdrCc.cci
index 6303374354..a66132f3d2 100644
--- a/src/HttpHdrCc.cci
+++ b/src/HttpHdrCc.cci
@@ -14,7 +14,7 @@
 bool
 HttpHdrCc::isSet(HttpHdrCcType id) const
 {
-    assert(id>=HttpHdrCcType::CC_PUBLIC && id < HttpHdrCcType::CC_ENUM_END);
+    assert(id < HttpHdrCcType::CC_ENUM_END);
     return EBIT_TEST(mask,id);
 }