From 06390e4bb70f3e5892a548e22ee97da09122c218 Mon Sep 17 00:00:00 2001 From: Francesco Chemolli Date: Fri, 31 Aug 2012 15:33:06 +0200 Subject: [PATCH] Moved prototypes: snmpStatGet to stat.h and strtokFile to cache_cf.h --- src/acl/Arp.cc | 1 + src/acl/Asn.cc | 1 + src/acl/Eui64.cc | 1 + src/acl/HierCodeData.cc | 1 + src/acl/HttpHeaderData.cc | 3 +-- src/acl/HttpStatus.cc | 3 +-- src/acl/IntRange.cc | 2 -- src/acl/Ip.cc | 2 -- src/acl/MaxConnection.cc | 3 +-- src/acl/MethodData.cc | 3 +-- src/acl/ProtocolData.cc | 3 +-- src/acl/SslErrorData.cc | 32 +++++++++++++++++++++++++++++++- src/acl/StringData.cc | 1 + src/cache_cf.h | 2 +- src/protos.h | 6 ------ src/stat.h | 3 +++ 16 files changed, 45 insertions(+), 22 deletions(-) diff --git a/src/acl/Arp.cc b/src/acl/Arp.cc index 19278d50a0..4704f30190 100644 --- 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 ffbd918d15..04a098d8ec 100644 --- 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 c2e4145412..f11d982496 100644 --- 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 3ec0534d69..add7286ad3 100644 --- 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 43f138cc8e..072c1f5698 100644 --- 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 f419810233..bfefd41078 100644 --- 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 53d9e82229..a5ecddd2b5 100644 --- 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 e323856170..e0ff19c0e6 100644 --- 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 c4b33239ca..9f9370471e 100644 --- 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 eaa9bdf525..76282ac9c8 100644 --- 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 6acc18a3d6..5384cc93d0 100644 --- 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 2b55f8f455..f980d5ccd9 100644 --- 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 */ #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 e2b4f5a371..bdbc5cf3ad 100644 --- 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 f7e1d10fee..c1e5faec66 100644 --- 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 9c5605cbf3..37347e15ac 100644 --- 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 7203bffe4f..9a8055fb01 100644 --- 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_ */ -- 2.47.3