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

diff --git a/src/HttpMsg.cc b/src/HttpMsg.cc
index 2922089ddd392af6aee2ad6127d3a0c039a4c1eb..b3e53cdee9a8a5a9b32594c27c4828b862174a71 100644 (file)
--- 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 d89603a6287a87298975d074c0df26e6a199b4ff..8570103320380c57ea11c0c4a3f9c08c08328a41 100644 (file)
--- 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 648ce1b8df35715f38e38dd3a74b129788834f14..8e560b243282cf0736dbb9ec3fcf8b031385ee86 100644 (file)
--- 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 4a7bc3c90a4401308220281f4984366c9736d3ec..0801f102a375ea9aa8eb1813fe40c744ac175847 100644 (file)
--- 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 cc9ed614a859fc54a53611bd2e1340e739a7de10..fea788d1aee67e90814abeb8753a2b815b4507e9 100644 (file)
--- 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 d35c71010ae364e4cc68c52c311715284055e88d..c904b1689bd64e5214718a0e2e6da2529824e4fd 100644 (file)
--- 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 98e52a89c3bd5d8200f28ba9d10521c01a3a5d03..a4794079ea78cc93d6c2780d929ddced23bcb6cc 100644 (file)
--- 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 e87dac74b985d64dd26997fe426e9e7690821c82..91829d5d3ec6756ef9188a1058cb30c01d4eb578 100644 (file)
--- 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 (file)
index 0000000..7a74d03
--- /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 14f27d1f7e8eac13764bfb31c663aa9f6805b87a..a051877efb75621a37fcb6099f41842025c35fd1 100644 (file)
--- 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 0528eb375086f206f3ed6ec17846e8e07aea97fc..c3480ac94b0e8d9354089914eaca18357331914b 100644 (file)
--- 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 af2c5178fbbcba1fe7f9571156d95ce78979ad76..02eeb2c28c7082f2c0223d88840975d96a74c40b 100644 (file)
--- 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 f5bc7dfadb9a584181860e52cbbe04e4b3eb04a4..ddb83428f9a75507762818e014a19f570b403d8a 100644 (file)
--- 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 3b02f4a77dd7ecf31ba912d2b545e104ed51a118..005cc2e0733fea6cd8b664a2f948d2b4ec37c7b1 100644 (file)
--- 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 f8bf55d666c5c8729ef020c5ca25a7a1c82a95da..22f1dcbf01084b438b0b6fc5e3767d5977e9e7fa 100644 (file)
--- 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 7c43217a0936513d4cba86942197e4712ea4c797..6b057e57ba6707ce1828ed48091f39c05b709002 100644 (file)
--- 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"