]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Remove always-true checks in HttpHdrCc (CID 1315405, 1315406)
authorFrancesco Chemolli <kinkie@squid-cache.org>
Thu, 6 Aug 2015 18:55:29 +0000 (20:55 +0200)
committerFrancesco Chemolli <kinkie@squid-cache.org>
Thu, 6 Aug 2015 18:55:29 +0000 (20:55 +0200)
src/HttpHdrCc.cc
src/HttpHdrCc.cci

index 51bc2a2299be643a19735a269e7d6102b036838a..eb0a672192776724dc559bb9111edad194c39052 100644 (file)
@@ -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 << ']';
index 630337435470b8b42342dbcdbb19387529a72c99..a66132f3d2efce9ecdcf6b94fbdd015fbadabaf4 100644 (file)
@@ -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);
 }