From: Francesco Chemolli Date: Thu, 30 Aug 2012 21:41:23 +0000 (+0200) Subject: Prep for removing some headers included via protos.h X-Git-Tag: sourceformat-review-1~34 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=67679543a97fe9fb3bae5308d057f3e828cd1324;p=thirdparty%2Fsquid.git Prep for removing some headers included via protos.h --- diff --git a/src/CpuAffinity.cc b/src/CpuAffinity.cc index b944c912b5..e6665682db 100644 --- a/src/CpuAffinity.cc +++ b/src/CpuAffinity.cc @@ -1,8 +1,5 @@ /* - * $Id$ - * * DEBUG: section 54 Interprocess Communication - * */ #include "squid.h" @@ -11,6 +8,7 @@ #include "CpuAffinityMap.h" #include "CpuAffinitySet.h" #include "Debug.h" +#include "globals.h" #include "protos.h" #include "structs.h" #include "tools.h" diff --git a/src/DiskIO/AIO/AIODiskFile.cc b/src/DiskIO/AIO/AIODiskFile.cc index 1d51d5bd35..230b52d7f1 100644 --- a/src/DiskIO/AIO/AIODiskFile.cc +++ b/src/DiskIO/AIO/AIODiskFile.cc @@ -1,5 +1,6 @@ /* - * $Id$ + * AUTHOR: Adrian Chadd + * DEBUG: section 79 Disk IO Routines * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- @@ -31,7 +32,6 @@ */ /** - * Author: Adrian Chadd * \par * These routines are simple plugin replacements for the file_* routines @@ -51,6 +51,7 @@ #include "DiskIO/ReadRequest.h" #include "DiskIO/WriteRequest.h" #include "disk.h" +#include "globals.h" #include "protos.h" #if HAVE_ERRNO_H diff --git a/src/DiskIO/AIO/AIODiskFile.h b/src/DiskIO/AIO/AIODiskFile.h index c424735df3..fe5ab9b546 100644 --- a/src/DiskIO/AIO/AIODiskFile.h +++ b/src/DiskIO/AIO/AIODiskFile.h @@ -1,6 +1,4 @@ /* - * $Id$ - * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- * diff --git a/src/DiskIO/Blocking/BlockingFile.cc b/src/DiskIO/Blocking/BlockingFile.cc index 2cb215a81d..8f9fb580ff 100644 --- a/src/DiskIO/Blocking/BlockingFile.cc +++ b/src/DiskIO/Blocking/BlockingFile.cc @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 47 Store Directory Routines * AUTHOR: Robert Collins * @@ -35,6 +33,8 @@ #include "squid.h" #include "BlockingFile.h" #include "Debug.h" +#include "defines.h" +#include "globals.h" #include "DiskIO/IORequestor.h" #include "DiskIO/ReadRequest.h" #include "DiskIO/WriteRequest.h" diff --git a/src/HttpHeader.cc b/src/HttpHeader.cc index c5666ff5c2..5368ab699a 100644 --- a/src/HttpHeader.cc +++ b/src/HttpHeader.cc @@ -1,7 +1,4 @@ - /* - * $Id$ - * * DEBUG: section 55 HTTP Header * AUTHOR: Alex Rousskov * @@ -30,11 +27,11 @@ * 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. - * */ #include "squid.h" #include "base64.h" +#include "globals.h" #include "HttpHdrCc.h" #include "HttpHdrContRange.h" #include "HttpHdrSc.h" diff --git a/src/HttpRequest.cc b/src/HttpRequest.cc index b1a8128a33..be4171e99f 100644 --- a/src/HttpRequest.cc +++ b/src/HttpRequest.cc @@ -1,7 +1,4 @@ - /* - * $Id$ - * * DEBUG: section 73 HTTP Request * AUTHOR: Duane Wessels * @@ -40,6 +37,7 @@ #include "client_side.h" #include "DnsLookupDetails.h" #include "err_detail_type.h" +#include "globals.h" #include "gopher.h" #include "http.h" #include "HttpHdrCc.h" diff --git a/src/client_side.cc b/src/client_side.cc index 0801f102a3..8efcd692a7 100644 --- a/src/client_side.cc +++ b/src/client_side.cc @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 33 Client-side Routines * AUTHOR: Duane Wessels * @@ -29,7 +27,6 @@ * 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. - * */ /** @@ -105,6 +102,7 @@ #include "fde.h" #include "forward.h" #include "fqdncache.h" +#include "globals.h" #include "http.h" #include "HttpHdrContRange.h" #include "HttpHeaderTools.h" diff --git a/src/comm/TcpAcceptor.cc b/src/comm/TcpAcceptor.cc index 371cbbc7a0..bd4bad91e2 100644 --- a/src/comm/TcpAcceptor.cc +++ b/src/comm/TcpAcceptor.cc @@ -43,6 +43,7 @@ #include "comm/TcpAcceptor.h" #include "fd.h" #include "fde.h" +#include "globals.h" #include "ip/Intercept.h" #include "profiler/Profiler.h" #include "protos.h" diff --git a/src/disk.cc b/src/disk.cc index eb31a75db4..632aa75346 100644 --- a/src/disk.cc +++ b/src/disk.cc @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 06 Disk I/O Routines * AUTHOR: Harvest Derived * @@ -36,6 +34,7 @@ #include "comm/Loops.h" #include "fd.h" #include "fde.h" +#include "globals.h" #include "Mem.h" #include "MemBuf.h" #include "profiler/Profiler.h" diff --git a/src/fs/rock/RockRebuild.cc b/src/fs/rock/RockRebuild.cc index 4b2b7d8fc9..636b16fc88 100644 --- a/src/fs/rock/RockRebuild.cc +++ b/src/fs/rock/RockRebuild.cc @@ -7,6 +7,7 @@ #include "fs/rock/RockRebuild.h" #include "fs/rock/RockSwapDir.h" #include "fs/rock/RockDbCell.h" +#include "globals.h" #include "md5.h" #include "protos.h" #include "tools.h" diff --git a/src/fs/rock/RockSwapDir.cc b/src/fs/rock/RockSwapDir.cc index 9bb6acc038..7c5db08e6f 100644 --- a/src/fs/rock/RockSwapDir.cc +++ b/src/fs/rock/RockSwapDir.cc @@ -15,6 +15,7 @@ #include "fs/rock/RockIoState.h" #include "fs/rock/RockIoRequests.h" #include "fs/rock/RockRebuild.h" +#include "globals.h" #include "ipc/mem/Pages.h" #include "MemObject.h" #include "Parsing.h" diff --git a/src/fs/ufs/RebuildState.cc b/src/fs/ufs/RebuildState.cc index 9f345fc3d5..28c388c5e4 100644 --- a/src/fs/ufs/RebuildState.cc +++ b/src/fs/ufs/RebuildState.cc @@ -1,5 +1,4 @@ /* - * * DEBUG: section 47 Store Directory Routines * AUTHOR: Robert Collins * @@ -33,12 +32,13 @@ #include "squid.h" #include "disk.h" +#include "globals.h" #include "protos.h" #include "RebuildState.h" #include "SquidTime.h" #include "store_key_md5.h" -#include "StoreSwapLogData.h" #include "store_rebuild.h" +#include "StoreSwapLogData.h" #include "tools.h" #include "UFSSwapLogParser.h" diff --git a/src/fs/ufs/UFSSwapDir.cc b/src/fs/ufs/UFSSwapDir.cc index 90828770c4..e64d106fa0 100644 --- a/src/fs/ufs/UFSSwapDir.cc +++ b/src/fs/ufs/UFSSwapDir.cc @@ -38,6 +38,7 @@ #include "DiskIO/DiskIOModule.h" #include "FileMap.h" #include "fde.h" +#include "globals.h" #include "Parsing.h" #include "protos.h" #include "RebuildState.h" diff --git a/src/gopher.cc b/src/gopher.cc index 68ca56fc9b..50270a96c6 100644 --- a/src/gopher.cc +++ b/src/gopher.cc @@ -1,7 +1,4 @@ - /* - * $Id$ - * * DEBUG: section 10 Gopher * AUTHOR: Harvest Derived * @@ -30,7 +27,6 @@ * 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. - * */ #include "squid.h" @@ -39,6 +35,7 @@ #include "errorpage.h" #include "fd.h" #include "forward.h" +#include "globals.h" #include "html_quote.h" #include "HttpReply.h" #include "HttpRequest.h" diff --git a/src/http.cc b/src/http.cc index c904b1689b..a34be79e7f 100644 --- a/src/http.cc +++ b/src/http.cc @@ -1,7 +1,4 @@ - /* - * $Id$ - * * DEBUG: section 11 Hypertext Transfer Protocol (HTTP) * AUTHOR: Harvest Derived * @@ -30,7 +27,6 @@ * 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. - * */ /* @@ -50,6 +46,7 @@ #include "errorpage.h" #include "fd.h" #include "fde.h" +#include "globals.h" #include "HttpControlMsg.h" #include "http.h" #include "HttpHdrCc.h" diff --git a/src/ipc/Kids.cc b/src/ipc/Kids.cc index 94089cf548..9abaffefbe 100644 --- a/src/ipc/Kids.cc +++ b/src/ipc/Kids.cc @@ -1,15 +1,14 @@ /* - * $Id$ - * * DEBUG: section 54 Interprocess Communication - * */ #include "squid.h" #include "base/TextException.h" +#include "globals.h" #include "ipc/Kids.h" #include "protos.h" #include "tools.h" +#include "structs.h" Kids TheKids; KidName TheKidName; diff --git a/src/protos.h b/src/protos.h index 6b7f6e9c01..ed9de7a5e9 100644 --- a/src/protos.h +++ b/src/protos.h @@ -88,8 +88,6 @@ extern void reconfigure(int); #include "fatal.h" - - SQUIDCEXTERN peer_t parseNeighborType(const char *s); SQUIDCEXTERN int stringHasWhitespace(const char *); //String.cc diff --git a/src/typedefs.h b/src/typedefs.h index 619fbd7f33..0dd6099aea 100644 --- a/src/typedefs.h +++ b/src/typedefs.h @@ -1,7 +1,4 @@ - /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ----------------------------------------------------------