From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Wed, 29 Aug 2012 12:36:10 +0000 (+0200)
Subject: Moved some MIME header function prototypes to newly-created mime_header.h
X-Git-Tag: sourceformat-review-1~58
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b61497976d1b597ed9dcac3657ba72f8d439ed81;p=thirdparty%2Fsquid.git

Moved some MIME header function prototypes to newly-created mime_header.h
---

diff --git a/src/HttpMsg.cc b/src/HttpMsg.cc
index 2922089ddd..b3e53cdee9 100644
--- a/src/HttpMsg.cc
+++ b/src/HttpMsg.cc
@@ -38,6 +38,7 @@
 #include "HttpHeaderTools.h"
 #include "HttpMsg.h"
 #include "MemBuf.h"
+#include "mime_header.h"
 #include "profiler/Profiler.h"
 #include "protos.h"
 
diff --git a/src/Makefile.am b/src/Makefile.am
index d89603a628..8570103320 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -412,6 +412,7 @@ squid_SOURCES = \
 	MemObject.cc \
 	MemObject.h \
 	mime.cc \
+	mime_header.h \
 	mime_header.cc \
 	multicast.cc \
 	neighbors.h \
@@ -1114,6 +1115,7 @@ tests_testHttpReply_SOURCES=\
 	mem.cc \
 	MemBuf.cc \
 	MemBuf.h \
+	mime_header.h \
 	mime_header.cc \
 	Packer.cc \
 	Packer.h \
@@ -1419,6 +1421,7 @@ tests_testCacheManager_SOURCES = \
 	MemBuf.cc \
 	MemObject.cc \
 	mime.cc \
+	mime_header.h \
 	mime_header.cc \
 	neighbors.h \
 	neighbors.cc \
@@ -1791,6 +1794,7 @@ tests_testEvent_SOURCES = \
 	MemBuf.cc \
 	MemObject.cc \
 	mime.cc \
+	mime_header.h \
 	mime_header.cc \
 	multicast.cc \
 	neighbors.h \
@@ -2009,6 +2013,7 @@ tests_testEventLoop_SOURCES = \
 	mem.cc \
 	mem_node.cc \
 	mime.cc \
+	mime_header.h \
 	mime_header.cc \
 	multicast.cc \
 	neighbors.h \
@@ -2224,6 +2229,7 @@ tests_test_http_range_SOURCES = \
 	mem.cc \
 	mem_node.cc \
 	mime.cc \
+	mime_header.h \
 	mime_header.cc \
 	multicast.cc \
 	neighbors.h \
@@ -2482,6 +2488,7 @@ tests_testHttpRequest_SOURCES = \
 	MemBuf.cc \
 	MemObject.cc \
 	mime.cc \
+	mime_header.h \
 	mime_header.cc \
 	neighbors.h \
 	neighbors.cc \
@@ -3492,6 +3499,7 @@ tests_testURL_SOURCES = \
 	MemBuf.cc \
 	MemObject.cc \
 	mime.cc \
+	mime_header.h \
 	mime_header.cc \
 	neighbors.h \
 	neighbors.cc \
diff --git a/src/MemStore.cc b/src/MemStore.cc
index 648ce1b8df..8e560b2432 100644
--- a/src/MemStore.cc
+++ b/src/MemStore.cc
@@ -12,6 +12,7 @@
 #include "ipc/mem/Pages.h"
 #include "MemObject.h"
 #include "MemStore.h"
+#include "mime_header.h"
 #include "protos.h"
 #include "StoreStats.h"
 
diff --git a/src/client_side.cc b/src/client_side.cc
index 4a7bc3c90a..0801f102a3 100644
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -119,6 +119,7 @@
 #include "Mem.h"
 #include "MemBuf.h"
 #include "MemObject.h"
+#include "mime_header.h"
 #include "profiler/Profiler.h"
 #include "protos.h"
 #include "rfc1738.h"
diff --git a/src/client_side_reply.cc b/src/client_side_reply.cc
index cc9ed614a8..fea788d1ae 100644
--- a/src/client_side_reply.cc
+++ b/src/client_side_reply.cc
@@ -53,6 +53,7 @@
 #include "ipcache.h"
 #include "log/access_log.h"
 #include "MemObject.h"
+#include "mime_header.h"
 #include "neighbors.h"
 #include "protos.h"
 #include "refresh.h"
diff --git a/src/http.cc b/src/http.cc
index d35c71010a..c904b1689b 100644
--- a/src/http.cc
+++ b/src/http.cc
@@ -62,6 +62,7 @@
 #include "log/access_log.h"
 #include "MemBuf.h"
 #include "MemObject.h"
+#include "mime_header.h"
 #include "neighbors.h"
 #include "profiler/Profiler.h"
 #include "protos.h"
diff --git a/src/icmp/net_db.cc b/src/icmp/net_db.cc
index 98e52a89c3..a4794079ea 100644
--- a/src/icmp/net_db.cc
+++ b/src/icmp/net_db.cc
@@ -52,6 +52,7 @@
 #include "fde.h"
 #include "forward.h"
 #include "internal.h"
+#include "mime_header.h"
 #include "protos.h"
 #include "SquidTime.h"
 #include "wordlist.h"
diff --git a/src/mime_header.cc b/src/mime_header.cc
index e87dac74b9..91829d5d3e 100644
--- a/src/mime_header.cc
+++ b/src/mime_header.cc
@@ -1,7 +1,4 @@
-
 /*
- * $Id$
- *
  * DEBUG: section 25    MiME Header Parsing
  * AUTHOR: Harvest Derived
  *
diff --git a/src/mime_header.h b/src/mime_header.h
new file mode 100644
index 0000000000..7a74d034a8
--- /dev/null
+++ b/src/mime_header.h
@@ -0,0 +1,40 @@
+/*
+ * DEBUG: section 25    MiME Header Parsing
+ * AUTHOR: Harvest Derived
+ *
+ * SQUID Web Proxy Cache          http://www.squid-cache.org/
+ * ----------------------------------------------------------
+ *
+ *  Squid is the result of efforts by numerous individuals from
+ *  the Internet community; see the CONTRIBUTORS file for full
+ *  details.   Many organizations have provided support for Squid's
+ *  development; see the SPONSORS file for full details.  Squid is
+ *  Copyrighted (C) 2001 by the Regents of the University of
+ *  California; see the COPYRIGHT file for full details.  Squid
+ *  incorporates software developed and/or copyrighted by other
+ *  sources; see the CREDITS file for full details.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
+ *
+ */
+
+#ifndef SQUID_MIME_HEADER_H_
+#define SQUID_MIME_HEADER_H_
+
+extern char *mime_get_header(const char *mime, const char *header);
+extern char *mime_get_header_field(const char *mime, const char *name, const char *prefix);
+extern size_t headersEnd(const char *, size_t);
+
+#endif /* SQUID_MIME_HEADER_H_ */
diff --git a/src/peer_digest.cc b/src/peer_digest.cc
index 14f27d1f7e..a051877efb 100644
--- a/src/peer_digest.cc
+++ b/src/peer_digest.cc
@@ -43,6 +43,7 @@
 #include "internal.h"
 #include "MemObject.h"
 #include "neighbors.h"
+#include "mime_header.h"
 #include "PeerDigest.h"
 #include "protos.h"
 #include "SquidTime.h"
diff --git a/src/protos.h b/src/protos.h
index 0528eb3750..c3480ac94b 100644
--- a/src/protos.h
+++ b/src/protos.h
@@ -80,10 +80,6 @@ extern variable_list *snmp_meshPtblFn(variable_list *, snint *);
 extern variable_list *snmp_meshCtblFn(variable_list *, snint *);
 #endif /* SQUID_SNMP */
 
-extern char *mime_get_header(const char *mime, const char *header);
-extern char *mime_get_header_field(const char *mime, const char *name, const char *prefix);
-extern size_t headersEnd(const char *, size_t);
-
 extern void mimeInit(char *filename);
 extern void mimeFreeMemory(void);
 extern char *mimeGetContentEncoding(const char *fn);
diff --git a/src/ssl/ErrorDetailManager.cc b/src/ssl/ErrorDetailManager.cc
index af2c5178fb..02eeb2c28c 100644
--- a/src/ssl/ErrorDetailManager.cc
+++ b/src/ssl/ErrorDetailManager.cc
@@ -2,6 +2,7 @@
 #include "ErrorDetail.h"
 #include "errorpage.h"
 #include "ErrorDetailManager.h"
+#include "mime_header.h"
 #include "protos.h"
 
 void Ssl::errorDetailInitialize()
diff --git a/src/store_client.cc b/src/store_client.cc
index f5bc7dfadb..ddb83428f9 100644
--- a/src/store_client.cc
+++ b/src/store_client.cc
@@ -40,6 +40,7 @@
 #include "HttpRequest.h"
 #include "MemBuf.h"
 #include "MemObject.h"
+#include "mime_header.h"
 #include "profiler/Profiler.h"
 #include "protos.h"
 #include "StatCounters.h"
diff --git a/src/tests/testHttpReply.cc b/src/tests/testHttpReply.cc
index 3b02f4a77d..005cc2e073 100644
--- a/src/tests/testHttpReply.cc
+++ b/src/tests/testHttpReply.cc
@@ -6,6 +6,7 @@
 #include "HttpHeader.h"
 #include "HttpReply.h"
 #include "Mem.h"
+#include "mime_header.h"
 #include "protos.h"
 
 CPPUNIT_TEST_SUITE_REGISTRATION( testHttpReply );
diff --git a/src/tests/testHttpRequest.cc b/src/tests/testHttpRequest.cc
index f8bf55d666..22f1dcbf01 100644
--- a/src/tests/testHttpRequest.cc
+++ b/src/tests/testHttpRequest.cc
@@ -7,6 +7,7 @@
 #include "HttpHeader.h"
 #include "HttpRequest.h"
 #include "Mem.h"
+#include "mime_header.h"
 #include "protos.h"
 
 CPPUNIT_TEST_SUITE_REGISTRATION( testHttpRequest );
diff --git a/src/urn.cc b/src/urn.cc
index 7c43217a09..6b057e57ba 100644
--- a/src/urn.cc
+++ b/src/urn.cc
@@ -44,6 +44,7 @@
 #include "globals.h"
 #include "SquidTime.h"
 #include "icmp/net_db.h"
+#include "mime_header.h"
 #include "protos.h"
 #include "URL.h"