From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Fri, 17 Aug 2012 12:13:41 +0000 (+0200)
Subject: Moved HttpHeader prototypes from protos.h to HttpHeader.h
X-Git-Tag: sourceformat-review-1~102
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ec6f82c10635f6db354d939d68d601d51484e163;p=thirdparty%2Fsquid.git

Moved HttpHeader prototypes from protos.h to HttpHeader.h
---

diff --git a/src/HttpHeader.h b/src/HttpHeader.h
index cf0c336a43..eab50bdc4b 100644
--- a/src/HttpHeader.h
+++ b/src/HttpHeader.h
@@ -295,9 +295,9 @@ private:
 
 
 extern int httpHeaderParseQuotedString(const char *start, const int len, String *val);
-SQUIDCEXTERN int httpHeaderHasByNameListMember(const HttpHeader * hdr, const char *name, const char *member, const char separator);
-SQUIDCEXTERN void httpHeaderUpdate(HttpHeader * old, const HttpHeader * fresh, const HttpHeaderMask * denied_mask);
-SQUIDCEXTERN void httpHeaderCalcMask(HttpHeaderMask * mask, http_hdr_type http_hdr_type_enums[], size_t count);
+extern int httpHeaderHasByNameListMember(const HttpHeader * hdr, const char *name, const char *member, const char separator);
+extern void httpHeaderUpdate(HttpHeader * old, const HttpHeader * fresh, const HttpHeaderMask * denied_mask);
+extern void httpHeaderCalcMask(HttpHeaderMask * mask, http_hdr_type http_hdr_type_enums[], size_t count);
 
 inline bool
 HttpHeader::chunked() const
@@ -306,4 +306,7 @@ HttpHeader::chunked() const
            hasListMember(HDR_TRANSFER_ENCODING, "chunked", ',');
 }
 
+extern void httpHeaderInitModule(void);
+extern void httpHeaderCleanModule(void);
+
 #endif /* SQUID_HTTPHEADER_H */
diff --git a/src/main.cc b/src/main.cc
index 1eb9596238..8cdd7349a1 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -53,6 +53,7 @@
 #include "fs/Module.h"
 #include "fqdncache.h"
 #include "htcp.h"
+#include "HttpHeader.h"
 #include "HttpReply.h"
 #include "icmp/IcmpSquid.h"
 #include "icmp/net_db.h"
diff --git a/src/protos.h b/src/protos.h
index 06b93a42ec..1f627fa335 100644
--- a/src/protos.h
+++ b/src/protos.h
@@ -161,10 +161,6 @@ extern const char *httpMakeVaryMark(HttpRequest * request, HttpReply const * rep
 
 #include "HttpStatusCode.h"
 
-class StatHist;
-
-/* Http Cache Control Header Field */
-
 /* Http Header Tools */
 class HttpHeaderFieldInfo;
 SQUIDCEXTERN HttpHeaderFieldInfo *httpHeaderBuildFieldsInfo(const HttpHeaderFieldAttrs * attrs, int count);
@@ -182,9 +178,6 @@ SQUIDCEXTERN int httpHeaderParseInt(const char *start, int *val);
 SQUIDCEXTERN void httpHeaderPutStrf(HttpHeader * hdr, http_hdr_type id, const char *fmt,...) PRINTF_FORMAT_ARG3;
 
 
-/* Http Header */
-SQUIDCEXTERN void httpHeaderInitModule(void);
-SQUIDCEXTERN void httpHeaderCleanModule(void);
 
 /* store report about current header usage and other stats */
 void httpHeaderStoreReport(StoreEntry * e);
diff --git a/src/tests/testHttpReply.cc b/src/tests/testHttpReply.cc
index b87ee3c32a..3b02f4a77d 100644
--- a/src/tests/testHttpReply.cc
+++ b/src/tests/testHttpReply.cc
@@ -3,6 +3,7 @@
 #include <cppunit/TestAssert.h>
 
 #include "testHttpReply.h"
+#include "HttpHeader.h"
 #include "HttpReply.h"
 #include "Mem.h"
 #include "protos.h"
diff --git a/src/tests/testHttpRequest.cc b/src/tests/testHttpRequest.cc
index 8197634aad..4e4d60d5b5 100644
--- a/src/tests/testHttpRequest.cc
+++ b/src/tests/testHttpRequest.cc
@@ -4,6 +4,7 @@
 #include <cppunit/TestAssert.h>
 
 #include "testHttpRequest.h"
+#include "HttpHeader.h"
 #include "HttpRequest.h"
 #include "Mem.h"
 #include "protos.h"