From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Mon, 12 Sep 2011 17:45:26 +0000 (+0200)
Subject: C++-refactored HttpHdrCcDestroy. Object can now be safely deleted.
X-Git-Tag: BumpSslServerFirst.take01~126^2~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3d7782c1303924c8ee3ff4807cc470ee82a92915;p=thirdparty%2Fsquid.git

C++-refactored HttpHdrCcDestroy. Object can now be safely deleted.
---

diff --git a/src/HttpHeaderCacheControl.cc b/src/HttpHeaderCacheControl.cc
index 07e0c8fea6..f55662a3e0 100644
--- a/src/HttpHeaderCacheControl.cc
+++ b/src/HttpHeaderCacheControl.cc
@@ -208,13 +208,6 @@ HttpHdrCc::parseInit(const String & str)
     return (mask != 0);
 }
 
-void
-httpHdrCcDestroy(HttpHdrCc * cc)
-{
-    assert(cc);
-    delete cc;
-}
-
 void
 httpHdrCcPackInto(const HttpHdrCc * cc, Packer * p)
 {
diff --git a/src/HttpReply.cc b/src/HttpReply.cc
index f5124f454d..75bd684999 100644
--- a/src/HttpReply.cc
+++ b/src/HttpReply.cc
@@ -402,7 +402,7 @@ HttpReply::hdrCacheClean()
     content_type.clean();
 
     if (cache_control) {
-        httpHdrCcDestroy(cache_control);
+        delete cache_control;
         cache_control = NULL;
     }
 
diff --git a/src/HttpRequest.cc b/src/HttpRequest.cc
index 3448d47b98..258acdc4e6 100644
--- a/src/HttpRequest.cc
+++ b/src/HttpRequest.cc
@@ -145,7 +145,7 @@ HttpRequest::clean()
     header.clean();
 
     if (cache_control) {
-        httpHdrCcDestroy(cache_control);
+        delete cache_control;
         cache_control = NULL;
     }
 
diff --git a/src/http.cc b/src/http.cc
index 6acb0e6e37..adb50265c5 100644
--- a/src/http.cc
+++ b/src/http.cc
@@ -1780,7 +1780,7 @@ HttpStateData::httpBuildRequestHeader(HttpRequest * request,
 
         hdr_out->putCc(cc);
 
-        httpHdrCcDestroy(cc);
+        delete cc;
     }
 
     /* maybe append Connection: keep-alive */
diff --git a/src/protos.h b/src/protos.h
index 189d3cd704..fedbee8354 100644
--- a/src/protos.h
+++ b/src/protos.h
@@ -237,7 +237,6 @@ SQUIDCEXTERN void httpBodyPackInto(const HttpBody * body, Packer * p);
 /* Http Cache Control Header Field */
 SQUIDCEXTERN void httpHdrCcInitModule(void);
 SQUIDCEXTERN void httpHdrCcCleanModule(void);
-SQUIDCEXTERN void httpHdrCcDestroy(HttpHdrCc * cc);
 SQUIDCEXTERN HttpHdrCc *httpHdrCcDup(const HttpHdrCc * cc);
 SQUIDCEXTERN void httpHdrCcPackInto(const HttpHdrCc * cc, Packer * p);
 SQUIDCEXTERN void httpHdrCcSetMaxAge(HttpHdrCc * cc, int max_age);