Moved cache_cf.cc prototypes to cache_cf.h

diff --git a/src/ConfigParser.cc b/src/ConfigParser.cc
index 9548eb7b7da7134d0b0318a722cbb3bb6363a04f..2ba9baaa4d21dcf5301194aa94eac9b9ec9c39e7 100644 (file)
--- a/src/ConfigParser.cc
+++ b/src/ConfigParser.cc
@@ -34,6 +34,7 @@
  */
 
 #include "squid.h"
+#include "cache_cf.h"
 #include "ConfigParser.h"
 #include "Debug.h"
 #include "globals.h"

diff --git a/src/DelaySpec.cc b/src/DelaySpec.cc
index b11b113b5e9c9001d52a4108b15639cf0644edca..fee83035eedcbb19dc8eef573bd94a5d97075c1c 100644 (file)
--- a/src/DelaySpec.cc
+++ b/src/DelaySpec.cc
@@ -40,6 +40,7 @@
 #include "squid.h"
 
 #if USE_DELAY_POOLS
+#include "cache_cf.h"
 #include "DelaySpec.h"
 #include "Parsing.h"
 #include "protos.h"

diff --git a/src/HelperChildConfig.cc b/src/HelperChildConfig.cc
index b75e3252a242ffeb96797549d8f2bb6a0de605e4..002bdda81e4d141aab6bb060e6f07f4d96606ee6 100644 (file)
--- a/src/HelperChildConfig.cc
+++ b/src/HelperChildConfig.cc
@@ -1,4 +1,5 @@
 #include "squid.h"
+#include "cache_cf.h"
 #include "Debug.h"
 #include "HelperChildConfig.h"
 #include "globals.h"

diff --git a/src/Parsing.cc b/src/Parsing.cc
index d4eb78b02565f5700995f41bfdc8d37ffa61ad5b..b88f54f83c62978643073a190fa4d76b702f2b10 100644 (file)
--- a/src/Parsing.cc
+++ b/src/Parsing.cc
@@ -33,6 +33,7 @@
  */
 
 #include "squid.h"
+#include "cache_cf.h"
 #include "compat/strtoll.h"
 #include "Parsing.h"
 #include "protos.h"

diff --git a/src/SwapDir.cc b/src/SwapDir.cc
index 0fa81ef1db77476f4c7cf107949234036b5c4212..3f870ce4bc87642eadfec61289b8ef50fbb320de 100644 (file)
--- a/src/SwapDir.cc
+++ b/src/SwapDir.cc
@@ -33,8 +33,10 @@
  */
 
 #include "squid.h"
+#include "cache_cf.h"
 #include "compat/strtoll.h"
 #include "ConfigOption.h"
+#include "Parsing.h"
 #include "protos.h"
 #include "StoreFileSystem.h"
 #include "SwapDir.h"

diff --git a/src/acl/CertificateData.cc b/src/acl/CertificateData.cc
index 809e54dac35b8cb71ccff6f7523a8141dd77dc5e..972e9536165f059b48646fad9d344fcb8ce9c88f 100644 (file)
--- a/src/acl/CertificateData.cc
+++ b/src/acl/CertificateData.cc
@@ -37,6 +37,7 @@
 #include "squid.h"
 #include "acl/CertificateData.h"
 #include "acl/Checklist.h"
+#include "cache_cf.h"
 #include "protos.h"
 #include "wordlist.h"
 

diff --git a/src/acl/DomainData.cc b/src/acl/DomainData.cc
index f187b6cc9c496c0fa4e1fa699dd67498033d64c7..d8f3484cb65adb1f06da5c5afde06b22fe951184 100644 (file)
--- a/src/acl/DomainData.cc
+++ b/src/acl/DomainData.cc
@@ -37,6 +37,7 @@
 #include "squid.h"
 #include "acl/DomainData.h"
 #include "acl/Checklist.h"
+#include "cache_cf.h"
 #include "Debug.h"
 #include "protos.h"
 #include "wordlist.h"

diff --git a/src/acl/IntRange.cc b/src/acl/IntRange.cc
index 863711ce15e421606e06ec6e4e0b64af3ac57b0f..53d9e8222985ddba7175e5d100954a134ca0be85 100644 (file)
--- a/src/acl/IntRange.cc
+++ b/src/acl/IntRange.cc
@@ -36,6 +36,7 @@
 
 #include "squid.h"
 #include "acl/IntRange.h"
+#include "cache_cf.h"
 #include "Debug.h"
 #include "wordlist.h"
 #include "Parsing.h"

diff --git a/src/acl/Ip.cc b/src/acl/Ip.cc
index 7aa3d0515523a49e48e1712a1c2c1e2b73f9723b..9769a73cb3a29678d1c823be74fd0acaa3eb3158 100644 (file)
--- a/src/acl/Ip.cc
+++ b/src/acl/Ip.cc
@@ -36,6 +36,7 @@
 #include "squid.h"
 #include "acl/Ip.h"
 #include "acl/Checklist.h"
+#include "cache_cf.h"
 #include "Debug.h"
 #include "ip/tools.h"
 #include "MemBuf.h"

diff --git a/src/acl/Random.cc b/src/acl/Random.cc
index 7d6630910e6d0178dbc53a6151f3c9bd53c357df..9205456e245903d3cedc510784014454aabd9bc3 100644 (file)
--- a/src/acl/Random.cc
+++ b/src/acl/Random.cc
@@ -36,7 +36,9 @@
 
 #include "acl/FilledChecklist.h"
 #include "acl/Random.h"
+#include "cache_cf.h"
 #include "Debug.h"
+#include "Parsing.h"
 #include "protos.h"
 #include "wordlist.h"
 

diff --git a/src/acl/TimeData.cc b/src/acl/TimeData.cc
index 68184f18d81488809d3ce56927af37990738a339..a625f06012147142e97f39231366b35dc83ab434 100644 (file)
--- a/src/acl/TimeData.cc
+++ b/src/acl/TimeData.cc
@@ -37,6 +37,7 @@
 #include "squid.h"
 #include "acl/TimeData.h"
 #include "acl/Checklist.h"
+#include "cache_cf.h"
 #include "Debug.h"
 #include "protos.h"
 #include "wordlist.h"

diff --git a/src/auth/AclMaxUserIp.cc b/src/auth/AclMaxUserIp.cc
index ef4230476344972952749639c5c67c04deb71686..0fdbacb0fee043892bed76a357af084d33cb46c8 100644 (file)
--- a/src/auth/AclMaxUserIp.cc
+++ b/src/auth/AclMaxUserIp.cc
@@ -12,6 +12,7 @@
 #include "protos.h"
 #include "wordlist.h"
 #include "ConfigParser.h"
+#include "Parsing.h"
 
 ACL *
 ACLMaxUserIP::clone() const

diff --git a/src/auth/basic/auth_basic.cc b/src/auth/basic/auth_basic.cc
index dde49bfe2c86b802cd3a6ca713f649e0cff83f8c..d9196b573b92f75fe87a1d32064db195c7ecec48 100644 (file)
--- a/src/auth/basic/auth_basic.cc
+++ b/src/auth/basic/auth_basic.cc
@@ -44,6 +44,7 @@
 #include "auth/basic/UserRequest.h"
 #include "auth/Gadgets.h"
 #include "auth/State.h"
+#include "cache_cf.h"
 #include "charset.h"
 #include "mgr/Registration.h"
 #include "Store.h"

diff --git a/src/auth/digest/auth_digest.cc b/src/auth/digest/auth_digest.cc
index 48715c112c846f5d7cda87c49951abd648c1559f..b0eb7a4cf066fc499bb4b212624bdf28d3f261df 100644 (file)
--- a/src/auth/digest/auth_digest.cc
+++ b/src/auth/digest/auth_digest.cc
@@ -38,6 +38,7 @@
 
 
 #include "squid.h"
+#include "cache_cf.h"
 #include "rfc2617.h"
 #include "auth/digest/auth_digest.h"
 #include "auth/digest/Scheme.h"

diff --git a/src/auth/negotiate/auth_negotiate.cc b/src/auth/negotiate/auth_negotiate.cc
index 5bd3f75f2c742f773c171f57ec2cd940a4d31cbc..631e4aba69f1db65f92e80f128d893bf64ff81e8 100644 (file)
--- a/src/auth/negotiate/auth_negotiate.cc
+++ b/src/auth/negotiate/auth_negotiate.cc
@@ -41,6 +41,7 @@
 #include "auth/negotiate/auth_negotiate.h"
 #include "auth/Gadgets.h"
 #include "auth/State.h"
+#include "cache_cf.h"
 #include "mgr/Registration.h"
 #include "Store.h"
 #include "client_side.h"

diff --git a/src/auth/ntlm/auth_ntlm.cc b/src/auth/ntlm/auth_ntlm.cc
index b4c2ea00e8886a7b3a5ebe8bde129ee14adb918e..dd1effe24bf5843be6fafba7e22cadfd9766d137 100644 (file)
--- a/src/auth/ntlm/auth_ntlm.cc
+++ b/src/auth/ntlm/auth_ntlm.cc
@@ -44,6 +44,7 @@
 #include "auth/ntlm/User.h"
 #include "auth/ntlm/UserRequest.h"
 #include "auth/State.h"
+#include "cache_cf.h"
 #include "mgr/Registration.h"
 #include "Store.h"
 #include "client_side.h"

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index 96f7c887f410200d8a182ef23a9539033e22136b..a75f1e384c7f8eff8a24a67506a601faef17bbaa 100644 (file)
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -38,6 +38,7 @@
 #include "acl/MethodData.h"
 #include "anyp/PortCfg.h"
 #include "base/RunnersRegistry.h"
+#include "cache_cf.h"
 #include "ConfigParser.h"
 #include "CpuAffinityMap.h"
 #include "DiskIO/DiskIOModule.h"
@@ -92,17 +93,12 @@
 #include "snmp.h"
 #endif
 
-
-
-
 #if HAVE_GLOB_H
 #include <glob.h>
 #endif
-
 #if HAVE_LIMITS_H
 #include <limits>
 #endif
-
 #if HAVE_LIST
 #include <list>
 #endif

diff --git a/src/cache_cf.h b/src/cache_cf.h
new file mode 100644 (file)
index 0000000..69e8abf
--- /dev/null
+++ b/src/cache_cf.h
@@ -0,0 +1,51 @@
+/*
+ * DEBUG: section 
+ * AUTHOR: 
+ *
+ * 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_CACHE_CF_H_
+#define SQUID_CACHE_CF_H_
+
+class wordlist;
+
+extern void configFreeMemory(void);
+extern void self_destruct(void);
+extern void add_http_port(char *portspec);
+
+/* extra functions from cache_cf.c useful for lib modules */
+extern void parse_int(int *var);
+extern void parse_onoff(int *var);
+extern void parse_eol(char *volatile *var);
+extern void parse_wordlist(wordlist ** list);
+extern void requirePathnameExists(const char *name, const char *path);
+extern void parse_time_t(time_t * var);
+
+#endif /* SQUID_CACHE_CF_H_ */

diff --git a/src/client_side_request.cc b/src/client_side_request.cc
index 8f8cff7dac024766620e8cb41cd3a904d7856004..aab40594b715265a0b213bb9c447f046b0d2aef9 100644 (file)
--- a/src/client_side_request.cc
+++ b/src/client_side_request.cc
@@ -66,6 +66,7 @@
 #include "ip/QosConfig.h"
 #include "log/access_log.h"
 #include "MemObject.h"
+#include "Parsing.h"
 #include "profiler/Profiler.h"
 #include "protos.h"
 #include "SquidTime.h"

diff --git a/src/errorpage.cc b/src/errorpage.cc
index d140568b2fb8a5ee9d99403e35f1ff07aec5a944..1d60e8ad1cae778a871fadb9898aa2079555374f 100644 (file)
--- a/src/errorpage.cc
+++ b/src/errorpage.cc
@@ -32,6 +32,7 @@
  *
  */
 #include "squid.h"
+#include "cache_cf.h"
 #include "comm/Connection.h"
 #include "comm/Write.h"
 #include "err_detail_type.h"

diff --git a/src/external_acl.cc b/src/external_acl.cc
index fa746b8564193befd1172e29bb1cc274caa9b731..0b4602c42cf6a707ed5adc2459108f0c2bccd5b0 100644 (file)
--- a/src/external_acl.cc
+++ b/src/external_acl.cc
@@ -43,6 +43,7 @@
 #include "squid.h"
 #include "acl/Acl.h"
 #include "acl/FilledChecklist.h"
+#include "cache_cf.h"
 #include "client_side.h"
 #include "comm/Connection.h"
 #include "ExternalACLEntry.h"

diff --git a/src/format/Config.cc b/src/format/Config.cc
index b81b718892fe50f60185b9b05f65e4ba7cc47515..3c1add0e01b09ec2b1e38c1a2b00da09efc5b38b 100644 (file)
--- a/src/format/Config.cc
+++ b/src/format/Config.cc
@@ -1,4 +1,5 @@
 #include "squid.h"
+#include "cache_cf.h"
 #include "format/Config.h"
 #include "protos.h"
 #include <list>

diff --git a/src/fs/coss/store_dir_coss.cc b/src/fs/coss/store_dir_coss.cc
index 36ad8a18fcf70a535bcb7cde8a39a3382c7744da..f9ceeb5a6341dbd27d8142f3c7afb0bdcc1c04cc 100644 (file)
--- a/src/fs/coss/store_dir_coss.cc
+++ b/src/fs/coss/store_dir_coss.cc
@@ -35,6 +35,7 @@
 
 #include "squid.h"
 #include "CossSwapDir.h"
+#include "cache_cf.h"
 #include "Store.h"
 #include "store_coss.h"
 #include "event.h"

diff --git a/src/fs/rock/RockSwapDir.cc b/src/fs/rock/RockSwapDir.cc
index 667ba1724b4b512746870497da1e27c4812a928f..da707faf338ef78b262ba87bc929baf57b2da247 100644 (file)
--- a/src/fs/rock/RockSwapDir.cc
+++ b/src/fs/rock/RockSwapDir.cc
@@ -5,6 +5,7 @@
  */
 
 #include "squid.h"
+#include "cache_cf.h"
 #include "ConfigOption.h"
 #include "DiskIO/DiskIOModule.h"
 #include "DiskIO/DiskIOStrategy.h"

diff --git a/src/fs/ufs/UFSSwapDir.cc b/src/fs/ufs/UFSSwapDir.cc
index 84d6629f733c27fd39909ed7539407643b61ee3c..84218a6988132e91976e9bfb347b6c0a2540583f 100644 (file)
--- a/src/fs/ufs/UFSSwapDir.cc
+++ b/src/fs/ufs/UFSSwapDir.cc
@@ -29,10 +29,10 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
  */
 
-#include "squid.h"
-
 #define CLEAN_BUF_SZ 16384
 
+#include "squid.h"
+#include "cache_cf.h"
 #include "ConfigOption.h"
 #include "DiskIO/DiskIOModule.h"
 #include "FileMap.h"

diff --git a/src/ip/QosConfig.cc b/src/ip/QosConfig.cc
index 97fbd9c06b4ba8274b9c710eaa5c921a9836b7fb..efa59dba83080876884a77bf4e298c3395723dd1 100644 (file)
--- a/src/ip/QosConfig.cc
+++ b/src/ip/QosConfig.cc
@@ -1,6 +1,7 @@
 #include "squid.h"
 
 #include "acl/Gadgets.h"
+#include "cache_cf.h"
 #include "comm/Connection.h"
 #include "ConfigParser.h"
 #include "fde.h"

diff --git a/src/ipc_win32.cc b/src/ipc_win32.cc
index 31ac49208c4cd7a1372ecbd6ec9dbcaf4d69f049..684742e2e25069e0cf9a33692c691aef3e0660ad 100644 (file)
--- a/src/ipc_win32.cc
+++ b/src/ipc_win32.cc
@@ -34,6 +34,7 @@
  */
 
 #include "squid.h"
+#include "cache_cf.h"
 #include "comm.h"
 #include "fde.h"
 #include "ip/Address.h"

diff --git a/src/log/Config.cc b/src/log/Config.cc
index 37dc7e5a5fe97b2c0d8b4129668ca32990d287bf..d39bcaa0a3ba6c5c242c61a9ab4c01096803f9ff 100644 (file)
--- a/src/log/Config.cc
+++ b/src/log/Config.cc
@@ -1,4 +1,5 @@
 #include "squid.h"
+#include "cache_cf.h"
 #include "log/Config.h"
 #include "protos.h"
 

diff --git a/src/main.cc b/src/main.cc
index ea33381da87a89e8b3c73fe2c82588a46f45c1cb..5fd8749f9eeed571e3e6e6ee36459704b27ecf83 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -39,6 +39,7 @@
 #include "base/RunnersRegistry.h"
 #include "base/Subscription.h"
 #include "base/TextException.h"
+#include "cache_cf.h"
 #include "carp.h"
 #include "client_db.h"
 #include "comm.h"

diff --git a/src/protos.h b/src/protos.h
index 287ebe0785ab7150f5f3417af83ea783c730f7b1..e604e03914dc344cb4137239e4170d81b22bc8e0 100644 (file)
--- a/src/protos.h
+++ b/src/protos.h
@@ -51,27 +51,6 @@ class HttpRequestMethod;
 class ClientInfo;
 #endif
 
-
-/*
- * cache_cf.c
- */
-SQUIDCEXTERN void configFreeMemory(void);
-class MemBuf;
-extern void self_destruct(void);
-SQUIDCEXTERN void add_http_port(char *portspec);
-extern int xatoi(const char *token);
-extern long xatol(const char *token);
-
-
-/* extra functions from cache_cf.c useful for lib modules */
-SQUIDCEXTERN void parse_int(int *var);
-SQUIDCEXTERN void parse_onoff(int *var);
-SQUIDCEXTERN void parse_eol(char *volatile *var);
-SQUIDCEXTERN void parse_wordlist(wordlist ** list);
-SQUIDCEXTERN void requirePathnameExists(const char *name, const char *path);
-SQUIDCEXTERN void parse_time_t(time_t * var);
-
-
 /* client_side.c - FD related client side routines */
 
 SQUIDCEXTERN void clientOpenListenSockets(void);

diff --git a/src/wccp2.cc b/src/wccp2.cc
index 45d0653b67ba88390efa1830749df0711edc0bfd..c7e7aa9c9139b17e5950ed171eca51816a4ae241 100644 (file)
--- a/src/wccp2.cc
+++ b/src/wccp2.cc
@@ -34,6 +34,7 @@
 
 #if USE_WCCPv2
 
+#include "cache_cf.h"
 #include "comm.h"
 #include "comm/Connection.h"
 #include "comm/Loops.h"