From: Francesco Chemolli Date: Fri, 17 Aug 2012 15:29:58 +0000 (+0200) Subject: Moved refresh prototypes from protos.h to refresh.h X-Git-Tag: sourceformat-review-1~95 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c6f15d40ab3444590c51e5b5d20ee2e58ebe5e65;p=thirdparty%2Fsquid.git Moved refresh prototypes from protos.h to refresh.h --- diff --git a/src/Makefile.am b/src/Makefile.am index fec01e8540..3236db25cf 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -424,6 +424,7 @@ squid_SOURCES = \ PingData.h \ protos.h \ redirect.cc \ + refresh.h \ refresh.cc \ RemovalPolicy.cc \ RemovalPolicy.h \ @@ -1384,6 +1385,7 @@ tests_testCacheManager_SOURCES = \ peer_sourcehash.cc \ peer_userhash.cc \ redirect.cc \ + refresh.h \ refresh.cc \ RemovalPolicy.cc \ Server.cc \ @@ -1517,6 +1519,7 @@ tests_testDiskIO_SOURCES = \ mem.cc \ Packer.cc \ Parsing.cc \ + refresh.h \ refresh.cc \ RemovalPolicy.cc \ StatCounters.h \ @@ -1725,6 +1728,7 @@ tests_testEvent_SOURCES = \ peer_sourcehash.cc \ peer_userhash.cc \ redirect.cc \ + refresh.h \ refresh.cc \ RemovalPolicy.cc \ Server.cc \ @@ -1925,6 +1929,7 @@ tests_testEventLoop_SOURCES = \ peer_userhash.cc \ RemovalPolicy.cc \ redirect.cc \ + refresh.h \ refresh.cc \ Server.cc \ $(SNMP_SOURCE) \ @@ -2119,6 +2124,7 @@ tests_test_http_range_SOURCES = \ peer_userhash.cc \ pconn.cc \ redirect.cc \ + refresh.h \ refresh.cc \ RemovalPolicy.cc \ Server.cc \ @@ -2354,6 +2360,7 @@ tests_testHttpRequest_SOURCES = \ peer_sourcehash.cc \ peer_userhash.cc \ redirect.cc \ + refresh.h \ refresh.cc \ RemovalPolicy.cc \ Server.cc \ @@ -2482,6 +2489,7 @@ tests_testStore_SOURCES= \ Packer.cc \ Parsing.cc \ RemovalPolicy.cc \ + refresh.h \ refresh.cc \ StatCounters.h \ StatCounters.cc \ @@ -2734,6 +2742,7 @@ tests_testUfs_SOURCES = \ tests/stub_errorpage.cc \ tests/stub_HttpRequest.cc \ tests/stub_access_log.cc \ + refresh.h \ refresh.cc \ tests/stub_store_client.cc \ tests/stub_tools.cc \ @@ -3005,6 +3014,7 @@ tests_testCoss_SOURCES = \ tests/stub_errorpage.cc \ tests/stub_HttpRequest.cc \ tests/stub_access_log.cc \ + refresh.h \ refresh.cc \ tests/stub_MemStore.cc \ tests/stub_Port.cc \ @@ -3142,6 +3152,7 @@ tests_testNull_SOURCES = \ tests/stub_errorpage.cc \ tests/stub_HttpRequest.cc \ tests/stub_access_log.cc \ + refresh.h \ refresh.cc \ tests/stub_store_client.cc \ tests/stub_store_stats.cc \ @@ -3284,6 +3295,7 @@ tests_testURL_SOURCES = \ peer_sourcehash.cc \ peer_userhash.cc \ redirect.cc \ + refresh.h \ refresh.cc \ RemovalPolicy.cc \ Server.cc \ diff --git a/src/client_side_reply.cc b/src/client_side_reply.cc index 3fdedcc45a..440492c3a5 100644 --- a/src/client_side_reply.cc +++ b/src/client_side_reply.cc @@ -52,6 +52,7 @@ #include "MemObject.h" #include "neighbors.h" #include "protos.h" +#include "refresh.h" #include "SquidTime.h" #include "Store.h" #include "StoreClient.h" diff --git a/src/htcp.cc b/src/htcp.cc index 74c9639af0..88de49e8c2 100644 --- a/src/htcp.cc +++ b/src/htcp.cc @@ -51,6 +51,7 @@ #include "md5.h" #include "MemBuf.h" #include "protos.h" +#include "refresh.h" #include "SquidTime.h" #include "StatCounters.h" #include "Store.h" diff --git a/src/http.cc b/src/http.cc index d6046f6357..8c173319b2 100644 --- a/src/http.cc +++ b/src/http.cc @@ -62,6 +62,7 @@ #include "neighbors.h" #include "profiler/Profiler.h" #include "protos.h" +#include "refresh.h" #include "rfc1738.h" #include "SquidTime.h" #include "StatCounters.h" diff --git a/src/icp_v2.cc b/src/icp_v2.cc index a4d1df6353..764732ebd4 100644 --- a/src/icp_v2.cc +++ b/src/icp_v2.cc @@ -53,6 +53,7 @@ #include "md5.h" #include "neighbors.h" #include "protos.h" +#include "refresh.h" #include "rfc1738.h" #include "SquidTime.h" #include "StatCounters.h" diff --git a/src/main.cc b/src/main.cc index c17fda818d..109bc37fe8 100644 --- a/src/main.cc +++ b/src/main.cc @@ -70,6 +70,7 @@ #include "PeerSelectState.h" #include "profiler/Profiler.h" #include "protos.h" +#include "refresh.h" #include "SquidDns.h" #include "SquidTime.h" #include "StatCounters.h" diff --git a/src/protos.h b/src/protos.h index 3404485fe7..2d225a0200 100644 --- a/src/protos.h +++ b/src/protos.h @@ -234,15 +234,6 @@ SQUIDCEXTERN void urnStart(HttpRequest *, StoreEntry *); SQUIDCEXTERN void redirectInit(void); SQUIDCEXTERN void redirectShutdown(void); -extern void refreshAddToList(const char *, int, time_t, int, time_t); -extern int refreshIsCachable(const StoreEntry *); -extern int refreshCheckHTTP(const StoreEntry *, HttpRequest *); -extern int refreshCheckICP(const StoreEntry *, HttpRequest *); -extern int refreshCheckHTCP(const StoreEntry *, HttpRequest *); -extern int refreshCheckDigest(const StoreEntry *, time_t delta); -extern time_t getMaxAge(const char *url); -extern void refreshInit(void); -extern const refresh_t *refreshLimits(const char *url); extern void shut_down(int); extern void rotate_logs(int); diff --git a/src/refresh.h b/src/refresh.h new file mode 100644 index 0000000000..804716ffc2 --- /dev/null +++ b/src/refresh.h @@ -0,0 +1,49 @@ +/* + * 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_REFRESH_H_ +#define SQUID_REFRESH_H_ + +extern void refreshAddToList(const char *, int, time_t, int, time_t); +extern int refreshIsCachable(const StoreEntry *); +extern int refreshCheckHTTP(const StoreEntry *, HttpRequest *); +extern int refreshCheckICP(const StoreEntry *, HttpRequest *); +extern int refreshCheckHTCP(const StoreEntry *, HttpRequest *); +extern int refreshCheckDigest(const StoreEntry *, time_t delta); +extern time_t getMaxAge(const char *url); +extern void refreshInit(void); +extern const refresh_t *refreshLimits(const char *url); + + + +#endif /* SQUID_REFRESH_H_ */ diff --git a/src/store_digest.cc b/src/store_digest.cc index 141e928adc..6f2efc0259 100644 --- a/src/store_digest.cc +++ b/src/store_digest.cc @@ -52,6 +52,7 @@ #include "HttpRequest.h" #include "MemObject.h" #include "PeerDigest.h" +#include "refresh.h" #include "SquidTime.h" #include "Store.h" #include "StoreSearch.h" diff --git a/test-suite/buildtests/layer-02-maximus.opts b/test-suite/buildtests/layer-02-maximus.opts index c7360d6fbd..8e564d05f6 100644 --- a/test-suite/buildtests/layer-02-maximus.opts +++ b/test-suite/buildtests/layer-02-maximus.opts @@ -108,6 +108,7 @@ DISTCHECK_CONFIGURE_FLAGS=" \ --with-pic \ --with-pthreads \ --enable-build-info=squid\ test\ build \ + --enable-ssl-crtd \ " # Fix the distclean testing.