From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Wed, 21 Sep 2011 07:32:21 +0000 (+0200)
Subject: Implemented HttpHdrCc::MAX_AGE_UNSET constant and used it instead of mask
X-Git-Tag: BumpSslServerFirst.take01~126^2~19^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=70aff22ff159b1e963872d3f59b171471010c0a5;p=thirdparty%2Fsquid.git

Implemented HttpHdrCc::MAX_AGE_UNSET constant and used it instead of mask
---

diff --git a/src/HttpHdrCc.cc b/src/HttpHdrCc.cc
index dd30b593dc..ff96e70c9a 100644
--- a/src/HttpHdrCc.cc
+++ b/src/HttpHdrCc.cc
@@ -167,7 +167,7 @@ HttpHdrCc::parse(const String & str)
             int32_t ma;
             if (!p || !httpHeaderParseInt(p, &ma)) {
                 debugs(65, 2, "cc: invalid max-age specs near '" << item << "'");
-                cc->setMaxAge(-1);
+                cc->setMaxAge(MAX_AGE_UNSET);
             } else {
                 cc->setMaxAge(ma);
             }
@@ -274,7 +274,7 @@ HttpHdrCc::setMaxAge(int max_age_)
         max_age = max_age_;
     } else {
         EBIT_CLR(mask, CC_MAX_AGE);
-        max_age=-1;
+        max_age=MAX_AGE_UNSET;
     }
 }
 
diff --git a/src/HttpHdrCc.h b/src/HttpHdrCc.h
index b0571e1115..09b0fd190d 100644
--- a/src/HttpHdrCc.h
+++ b/src/HttpHdrCc.h
@@ -44,15 +44,19 @@ class HttpHdrCc
 {
 
 public:
+	static const int32_t MAX_AGE_UNSET=-1; //max-age is unset
+
     explicit HttpHdrCc() :
-            mask(0), max_age(-1), s_maxage(-1),
+            mask(0), max_age(MAX_AGE_UNSET), s_maxage(-1),
             max_stale(-1), stale_if_error(0),
             min_fresh(-1) {}
 
     void clear();
     bool parse(const String & s);
+
     void setMaxAge(int32_t max_age);
     int32_t getMaxAge() const;
+
     MEMPROXY_CLASS(HttpHdrCc);
 
     int32_t mask;