Moved prototypes: snmpStatGet to stat.h and strtokFile to cache_cf.h

diff --git a/src/acl/Arp.cc b/src/acl/Arp.cc
index 19278d50a0b3519f473815faca5171865fd47b8e..4704f30190ee05438844ebb44f4a8833eadd8d2d 100644 (file)
--- a/src/acl/Arp.cc
+++ b/src/acl/Arp.cc
@@ -38,6 +38,7 @@
 
 #include "acl/Arp.h"
 #include "acl/FilledChecklist.h"
+#include "cache_cf.h"
 #include "Debug.h"
 #include "eui/Eui48.h"
 #include "ip/Address.h"

diff --git a/src/acl/Asn.cc b/src/acl/Asn.cc
index ffbd918d1546cb1aff66c6eb93629b7b5b5c67b2..04a098d8ecb3316067fc947a7f25bc0dda77a192 100644 (file)
--- a/src/acl/Asn.cc
+++ b/src/acl/Asn.cc
@@ -45,6 +45,7 @@
 #include "acl/SourceAsn.h"
 #include "acl/DestinationAsn.h"
 #include "acl/DestinationIp.h"
+#include "cache_cf.h"
 #include "HttpReply.h"
 #include "ipcache.h"
 #include "forward.h"

diff --git a/src/acl/Eui64.cc b/src/acl/Eui64.cc
index c2e41454120635076957a76cde13d090eb8a3ce3..f11d982496d8fa9dd07b4d138414ca637a74869e 100644 (file)
--- a/src/acl/Eui64.cc
+++ b/src/acl/Eui64.cc
@@ -38,6 +38,7 @@
 
 #include "acl/Eui64.h"
 #include "acl/FilledChecklist.h"
+#include "cache_cf.h"
 #include "Debug.h"
 #include "eui/Eui64.h"
 #include "ip/Address.h"

diff --git a/src/acl/HierCodeData.cc b/src/acl/HierCodeData.cc
index 3ec0534d69d2177236b6cbfcd96dbec347598e6f..add7286ad3e3d015bd66c70bfed233ac80ce30ff 100644 (file)
--- a/src/acl/HierCodeData.cc
+++ b/src/acl/HierCodeData.cc
@@ -1,6 +1,7 @@
 #include "squid.h"
 #include "acl/HierCodeData.h"
 #include "acl/Checklist.h"
+#include "cache_cf.h"
 #include "hier_code.h"
 #include "protos.h"
 #include "wordlist.h"

diff --git a/src/acl/HttpHeaderData.cc b/src/acl/HttpHeaderData.cc
index 43f138cc8ecfe20bb54ab8bb7a674bba760fb5a6..072c1f5698fba9fcda09523a1a03b1238b465604 100644 (file)
--- a/src/acl/HttpHeaderData.cc
+++ b/src/acl/HttpHeaderData.cc
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
  *
@@ -39,6 +37,7 @@
 #include "acl/Checklist.h"
 #include "acl/Acl.h"
 #include "acl/RegexData.h"
+#include "cache_cf.h"
 #include "Debug.h"
 #include "protos.h"
 #include "wordlist.h"

diff --git a/src/acl/HttpStatus.cc b/src/acl/HttpStatus.cc
index f419810233d4da73e1aaf7263cce6cd552d576d5..bfefd4107868f2b66c875566b7048c6cdcb86198 100644 (file)
--- a/src/acl/HttpStatus.cc
+++ b/src/acl/HttpStatus.cc
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
  *
@@ -37,6 +35,7 @@
 #include "squid.h"
 #include "acl/HttpStatus.h"
 #include "acl/FilledChecklist.h"
+#include "cache_cf.h"
 #include "Debug.h"
 #include "HttpReply.h"
 #include "protos.h"

diff --git a/src/acl/IntRange.cc b/src/acl/IntRange.cc
index 53d9e8222985ddba7175e5d100954a134ca0be85..a5ecddd2b5497eadb9e74ba3745716e46dfcb603 100644 (file)
--- a/src/acl/IntRange.cc
+++ b/src/acl/IntRange.cc
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * DEBUG: section 28    Access Control
  * AUTHOR: Robert Collins
  *

diff --git a/src/acl/Ip.cc b/src/acl/Ip.cc
index e323856170514416c1170df103b2a74e3954682c..e0ff19c0e62a398144b766fcebbd5ff91c841e21 100644 (file)
--- a/src/acl/Ip.cc
+++ b/src/acl/Ip.cc
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
  *

diff --git a/src/acl/MaxConnection.cc b/src/acl/MaxConnection.cc
index c4b33239cacde74e43e6b6187f9e673f07e45d16..9f9370471e1342c76ffdbada83a46a8e4c65a29e 100644 (file)
--- a/src/acl/MaxConnection.cc
+++ b/src/acl/MaxConnection.cc
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
  *
@@ -37,6 +35,7 @@
 #include "squid.h"
 #include "acl/FilledChecklist.h"
 #include "acl/MaxConnection.h"
+#include "cache_cf.h"
 #include "client_db.h"
 #include "Debug.h"
 #include "protos.h"

diff --git a/src/acl/MethodData.cc b/src/acl/MethodData.cc
index eaa9bdf525da6b1030a63ff5457899524273725e..76282ac9c81ca2e04939cf28abedfcfdde8f0912 100644 (file)
--- a/src/acl/MethodData.cc
+++ b/src/acl/MethodData.cc
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
  *
@@ -37,6 +35,7 @@
 #include "squid.h"
 #include "acl/MethodData.h"
 #include "acl/Checklist.h"
+#include "cache_cf.h"
 #include "HttpRequestMethod.h"
 #include "protos.h"
 #include "wordlist.h"

diff --git a/src/acl/ProtocolData.cc b/src/acl/ProtocolData.cc
index 6acc18a3d68da658bd8fda5099f5f76c669db7af..5384cc93d0176bf889b5be6335ef3a6054344179 100644 (file)
--- a/src/acl/ProtocolData.cc
+++ b/src/acl/ProtocolData.cc
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
  *
@@ -37,6 +35,7 @@
 #include "squid.h"
 #include "acl/ProtocolData.h"
 #include "acl/Checklist.h"
+#include "cache_cf.h"
 #include "Debug.h"
 #include "protos.h"
 #include "URLScheme.h"

diff --git a/src/acl/SslErrorData.cc b/src/acl/SslErrorData.cc
index 2b55f8f4554ca7e804a0cd94983159e3f13f4e17..f980d5ccd9d1135bc510890a83eacb464b1f7ffd 100644 (file)
--- a/src/acl/SslErrorData.cc
+++ b/src/acl/SslErrorData.cc
@@ -1,10 +1,40 @@
 /*
- * $Id$
+ * DEBUG: none
+ *
+ * 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.
+ *
+ *
+ * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
 #include "squid.h"
 #include "acl/SslErrorData.h"
 #include "acl/Checklist.h"
+#include "cache_cf.h"
 #include "protos.h"
 #include "wordlist.h"
 

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

diff --git a/src/cache_cf.h b/src/cache_cf.h
index f7e1d10feed0ce66d7a1852ef97e2878bd40839a..c1e5faec66b5f61f5d004bf2bd2115ce526d4d34 100644 (file)
--- a/src/cache_cf.h
+++ b/src/cache_cf.h
@@ -46,6 +46,6 @@ 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);
-
+extern char *strtokFile(void);
 
 #endif /* SQUID_CACHE_CF_H_ */

diff --git a/src/protos.h b/src/protos.h
index 9c5605cbf39e8191a095e20f58ffd68d633905dd..37347e15acc5aa1c8b81fade930cb517eddd7d92 100644 (file)
--- a/src/protos.h
+++ b/src/protos.h
@@ -80,11 +80,6 @@ extern void reconfigure(int);
 
 #include "fatal.h"
 
-/*
- * hack to allow snmp access to the statistics counters
- */
-class StatCounters;
-        SQUIDCEXTERN StatCounters *snmpStatGet(int);
 
         /* CygWin & Windows NT Port */
         /* win32.c */
@@ -110,7 +105,6 @@ class StatCounters;
 
 #endif
 
-    extern char *strtokFile(void);
 
 #if USE_AUTH
 

diff --git a/src/stat.h b/src/stat.h
index 7203bffe4f63ecb4a6caff6bfa40059403ee4825..9a8055fb01dcb31a9a1fdfd7b47b52c5c2e89ea3 100644 (file)
--- a/src/stat.h
+++ b/src/stat.h
@@ -44,4 +44,7 @@ extern double statRequestHitMemoryRatio(int minutes);
 extern double statRequestHitDiskRatio(int minutes);
 extern double statByteHitRatio(int minutes);
 
+class StatCounters;
+extern StatCounters *snmpStatGet(int);
+
 #endif /* SQUID_STAT_H_ */