From: wessels <>
Date: Fri, 16 Sep 2005 01:04:56 +0000 (+0000)
Subject: Removing unused function httpHdrCcJoinWith()
X-Git-Tag: SQUID_3_0_PRE4~615
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0b78d1858a70eba73261f06a6716884df838806c;p=thirdparty%2Fsquid.git

Removing unused function httpHdrCcJoinWith()
---

diff --git a/src/HttpHdrCc.cc b/src/HttpHdrCc.cc
index dfa43d0349..d9d718570b 100644
--- a/src/HttpHdrCc.cc
+++ b/src/HttpHdrCc.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: HttpHdrCc.cc,v 1.27 2005/04/23 14:49:41 serassio Exp $
+ * $Id: HttpHdrCc.cc,v 1.28 2005/09/15 19:04:56 wessels Exp $
  *
  * DEBUG: section 65    HTTP Cache Control Header
  * AUTHOR: Alex Rousskov
@@ -257,23 +257,6 @@ httpHdrCcPackInto(const HttpHdrCc * cc, Packer * p)
         packerPrintf(p, (pcount ? ", %s" : "%s"), cc->other.buf());
 }
 
-void
-httpHdrCcJoinWith(HttpHdrCc * cc, const HttpHdrCc * new_cc)
-{
-    assert(cc && new_cc);
-
-    if (cc->max_age < 0)
-        cc->max_age = new_cc->max_age;
-
-    if (cc->s_maxage < 0)
-        cc->s_maxage = new_cc->s_maxage;
-
-    if (cc->max_stale < 0)
-        cc->max_stale = new_cc->max_stale;
-
-    cc->mask |= new_cc->mask;
-}
-
 /* negative max_age will clean old max_Age setting */
 void
 httpHdrCcSetMaxAge(HttpHdrCc * cc, int max_age)
diff --git a/src/protos.h b/src/protos.h
index 093ea1c5f6..1f63b30439 100644
--- a/src/protos.h
+++ b/src/protos.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: protos.h,v 1.510 2005/09/14 21:09:38 wessels Exp $
+ * $Id: protos.h,v 1.511 2005/09/15 19:04:56 wessels Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -321,7 +321,6 @@ SQUIDCEXTERN HttpHdrCc *httpHdrCcParseCreate(const String * str);
 SQUIDCEXTERN void httpHdrCcDestroy(HttpHdrCc * cc);
 SQUIDCEXTERN HttpHdrCc *httpHdrCcDup(const HttpHdrCc * cc);
 SQUIDCEXTERN void httpHdrCcPackInto(const HttpHdrCc * cc, Packer * p);
-SQUIDCEXTERN void httpHdrCcJoinWith(HttpHdrCc * cc, const HttpHdrCc * new_cc);
 SQUIDCEXTERN void httpHdrCcSetMaxAge(HttpHdrCc * cc, int max_age);
 SQUIDCEXTERN void httpHdrCcSetSMaxAge(HttpHdrCc * cc, int s_maxage);
 SQUIDCEXTERN void httpHdrCcUpdateStats(const HttpHdrCc * cc, StatHist * hist);