From: Francesco Chemolli Date: Tue, 21 Aug 2012 14:24:30 +0000 (+0200) Subject: moved disk.cc-related headers to new disk.h X-Git-Tag: sourceformat-review-1~75 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=438b04d4b3d20a47dec30b819f832ad4dd092548;p=thirdparty%2Fsquid.git moved disk.cc-related headers to new disk.h --- diff --git a/src/DiskIO/AIO/AIODiskFile.cc b/src/DiskIO/AIO/AIODiskFile.cc index fa2132f8ed..1d51d5bd35 100644 --- a/src/DiskIO/AIO/AIODiskFile.cc +++ b/src/DiskIO/AIO/AIODiskFile.cc @@ -50,6 +50,7 @@ #include "DiskIO/IORequestor.h" #include "DiskIO/ReadRequest.h" #include "DiskIO/WriteRequest.h" +#include "disk.h" #include "protos.h" #if HAVE_ERRNO_H diff --git a/src/DiskIO/Blocking/BlockingFile.cc b/src/DiskIO/Blocking/BlockingFile.cc index 38e5b613af..5bfa3d2511 100644 --- a/src/DiskIO/Blocking/BlockingFile.cc +++ b/src/DiskIO/Blocking/BlockingFile.cc @@ -38,6 +38,7 @@ #include "DiskIO/IORequestor.h" #include "DiskIO/ReadRequest.h" #include "DiskIO/WriteRequest.h" +#include "disk.h" #include "protos.h" #if HAVE_ERRNO_H diff --git a/src/DiskIO/DiskThreads/DiskThreadsDiskFile.cc b/src/DiskIO/DiskThreads/DiskThreadsDiskFile.cc index 0edfb25637..89ee7df28c 100644 --- a/src/DiskIO/DiskThreads/DiskThreadsDiskFile.cc +++ b/src/DiskIO/DiskThreads/DiskThreadsDiskFile.cc @@ -35,6 +35,7 @@ #include "squid.h" +#include "disk.h" #include "DiskThreadsDiskFile.h" #include "DiskIO/IORequestor.h" #include "DiskIO/ReadRequest.h" diff --git a/src/DiskIO/IpcIo/IpcIoFile.cc b/src/DiskIO/IpcIo/IpcIoFile.cc index 71a7ce7833..cac9fc982e 100644 --- a/src/DiskIO/IpcIo/IpcIoFile.cc +++ b/src/DiskIO/IpcIo/IpcIoFile.cc @@ -11,6 +11,7 @@ #include "DiskIO/IpcIo/IpcIoFile.h" #include "DiskIO/ReadRequest.h" #include "DiskIO/WriteRequest.h" +#include "disk.h" #include "globals.h" #include "ipc/mem/Pages.h" #include "ipc/Messages.h" diff --git a/src/DiskIO/Mmapped/MmappedFile.cc b/src/DiskIO/Mmapped/MmappedFile.cc index 8e0084b421..03e8a08e86 100644 --- a/src/DiskIO/Mmapped/MmappedFile.cc +++ b/src/DiskIO/Mmapped/MmappedFile.cc @@ -10,6 +10,7 @@ #include "DiskIO/Mmapped/MmappedFile.h" #include "DiskIO/ReadRequest.h" #include "DiskIO/WriteRequest.h" +#include "disk.h" #include "globals.h" #include "protos.h" diff --git a/src/Makefile.am b/src/Makefile.am index 3903ababd8..679258a4d4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -307,6 +307,7 @@ squid_SOURCES = \ Debug.h \ defines.h \ $(DELAY_POOL_SOURCE) \ + disk.h \ disk.cc \ $(DISKIO_SOURCE) \ dlink.h \ @@ -1348,6 +1349,7 @@ tests_testCacheManager_SOURCES = \ CpuAffinitySet.h \ $(DELAY_POOL_SOURCE) \ $(DISKIO_SOURCE) \ + disk.h \ disk.cc \ dlink.h \ dlink.cc \ @@ -1522,6 +1524,7 @@ tests_testDiskIO_SOURCES = \ ConfigParser.cc \ $(DELAY_POOL_SOURCE) \ $(DISKIO_SOURCE) \ + disk.h \ disk.cc \ ETag.cc \ EventLoop.cc \ @@ -1700,6 +1703,7 @@ tests_testEvent_SOURCES = \ debug.cc \ $(DELAY_POOL_SOURCE) \ $(DISKIO_SOURCE) \ + disk.h \ disk.cc \ dlink.h \ dlink.cc \ @@ -1911,6 +1915,7 @@ tests_testEventLoop_SOURCES = \ debug.cc \ $(DELAY_POOL_SOURCE) \ $(DISKIO_SOURCE) \ + disk.h \ disk.cc \ dlink.h \ dlink.cc \ @@ -2121,6 +2126,7 @@ tests_test_http_range_SOURCES = \ debug.cc \ $(DELAY_POOL_SOURCE) \ $(DISKIO_SOURCE) \ + disk.h \ disk.cc \ dlink.h \ dlink.cc \ @@ -2381,6 +2387,7 @@ tests_testHttpRequest_SOURCES = \ CpuAffinitySet.cc \ CpuAffinitySet.h \ $(DELAY_POOL_SOURCE) \ + disk.h \ disk.cc \ dlink.h \ dlink.cc \ @@ -2549,6 +2556,7 @@ tests_testStore_SOURCES= \ ConfigOption.cc \ ConfigParser.cc \ $(DELAY_POOL_SOURCE) \ + disk.h \ disk.cc \ DiskIO/ReadRequest.cc \ DiskIO/WriteRequest.cc \ @@ -2767,6 +2775,7 @@ tests_testUfs_SOURCES = \ tests/stub_store_stats.cc \ fd.cc \ client_db.h \ + disk.h \ disk.cc \ FileMap.h \ filemap.cc \ @@ -2907,6 +2916,7 @@ tests_testRock_SOURCES = \ CacheDigest.cc \ ConfigOption.cc \ ConfigParser.cc \ + disk.h \ disk.cc \ ETag.cc \ EventLoop.cc \ @@ -3055,6 +3065,7 @@ tests_testCoss_SOURCES = \ tests/stub_store_rebuild.cc \ tests/stub_store_stats.cc \ fd.cc \ + disk.h \ disk.cc \ FileMap.h \ filemap.cc \ @@ -3198,6 +3209,7 @@ tests_testNull_SOURCES = \ tests/stub_store_rebuild.cc \ tests/stub_store_stats.cc \ fd.cc \ + disk.h \ disk.cc \ FileMap.h \ filemap.cc \ @@ -3352,6 +3364,7 @@ tests_testURL_SOURCES = \ CpuAffinitySet.cc \ CpuAffinitySet.h \ $(DELAY_POOL_SOURCE) \ + disk.h \ disk.cc \ DiskIO/ReadRequest.cc \ DiskIO/WriteRequest.cc \ diff --git a/src/disk.h b/src/disk.h new file mode 100644 index 0000000000..6848004e15 --- /dev/null +++ b/src/disk.h @@ -0,0 +1,40 @@ +/* + * 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_DISK_H_ +#define SQUID_DISK_H_ + +extern int file_open(const char *path, int mode); +extern void file_close(int fd); + +#endif /* SQUID_DISK_H_ */ diff --git a/src/errorpage.cc b/src/errorpage.cc index 1d60e8ad1c..5de5d3a578 100644 --- a/src/errorpage.cc +++ b/src/errorpage.cc @@ -35,6 +35,7 @@ #include "cache_cf.h" #include "comm/Connection.h" #include "comm/Write.h" +#include "disk.h" #include "err_detail_type.h" #include "errorpage.h" #include "Store.h" diff --git a/src/fs/coss/store_dir_coss.cc b/src/fs/coss/store_dir_coss.cc index f9ceeb5a63..3e84034ed5 100644 --- a/src/fs/coss/store_dir_coss.cc +++ b/src/fs/coss/store_dir_coss.cc @@ -38,6 +38,7 @@ #include "cache_cf.h" #include "Store.h" #include "store_coss.h" +#include "disk.h" #include "event.h" #include "fde.h" #include "SwapDir.h" diff --git a/src/fs/rock/RockRebuild.cc b/src/fs/rock/RockRebuild.cc index 94e84b1570..0d62591d15 100644 --- a/src/fs/rock/RockRebuild.cc +++ b/src/fs/rock/RockRebuild.cc @@ -5,6 +5,7 @@ */ #include "squid.h" +#include "disk.h" #include "fs/rock/RockRebuild.h" #include "fs/rock/RockSwapDir.h" #include "fs/rock/RockDbCell.h" diff --git a/src/fs/ufs/RebuildState.cc b/src/fs/ufs/RebuildState.cc index f0c5767e26..28f694b8f9 100644 --- a/src/fs/ufs/RebuildState.cc +++ b/src/fs/ufs/RebuildState.cc @@ -32,6 +32,7 @@ */ #include "squid.h" +#include "disk.h" #include "protos.h" #include "RebuildState.h" #include "SquidTime.h" diff --git a/src/fs/ufs/UFSSwapDir.cc b/src/fs/ufs/UFSSwapDir.cc index 84218a6988..0e2b8162cb 100644 --- a/src/fs/ufs/UFSSwapDir.cc +++ b/src/fs/ufs/UFSSwapDir.cc @@ -33,6 +33,7 @@ #include "squid.h" #include "cache_cf.h" +#include "disk.h" #include "ConfigOption.h" #include "DiskIO/DiskIOModule.h" #include "FileMap.h" diff --git a/src/icmp/net_db.cc b/src/icmp/net_db.cc index 0f75f7221c..3ed9dc97a5 100644 --- a/src/icmp/net_db.cc +++ b/src/icmp/net_db.cc @@ -59,6 +59,7 @@ #include "neighbors.h" #include "URL.h" #include "Mem.h" +#include "disk.h" #if HAVE_SYS_STAT_H diff --git a/src/log/ModStdio.cc b/src/log/ModStdio.cc index 0de3d88ccf..abe76f0738 100644 --- a/src/log/ModStdio.cc +++ b/src/log/ModStdio.cc @@ -31,6 +31,7 @@ */ #include "squid.h" +#include "disk.h" #include "fde.h" #include "globals.h" #include "log/File.h" diff --git a/src/log/ModTcp.cc b/src/log/ModTcp.cc index ab27445f46..0d460b0d8e 100644 --- a/src/log/ModTcp.cc +++ b/src/log/ModTcp.cc @@ -34,6 +34,7 @@ #include "squid.h" #include "comm.h" #include "comm/Connection.h" +#include "disk.h" #include "log/File.h" #include "log/ModTcp.h" #include "Parsing.h" diff --git a/src/log/ModUdp.cc b/src/log/ModUdp.cc index e470714ba2..15b3115cd5 100644 --- a/src/log/ModUdp.cc +++ b/src/log/ModUdp.cc @@ -33,6 +33,7 @@ #include "squid.h" #include "comm.h" #include "comm/Connection.h" +#include "disk.h" #include "log/File.h" #include "log/ModUdp.h" #include "Parsing.h" diff --git a/src/main.cc b/src/main.cc index 85f568046c..502da17b95 100644 --- a/src/main.cc +++ b/src/main.cc @@ -46,6 +46,7 @@ #include "comm.h" #include "ConfigParser.h" #include "CpuAffinity.h" +#include "disk.h" #include "DiskIO/DiskIOModule.h" #include "errorpage.h" #include "event.h" diff --git a/src/mime.cc b/src/mime.cc index 27fd3821fb..aab0d6b556 100644 --- a/src/mime.cc +++ b/src/mime.cc @@ -34,6 +34,7 @@ */ #include "squid.h" +#include "disk.h" #include "fde.h" #include "globals.h" #include "HttpHdrCc.h" diff --git a/src/protos.h b/src/protos.h index 3292f79d69..c4a1511b43 100644 --- a/src/protos.h +++ b/src/protos.h @@ -51,9 +51,6 @@ class HttpRequestMethod; class ClientInfo; #endif -/* disk.c */ -SQUIDCEXTERN int file_open(const char *path, int mode); -SQUIDCEXTERN void file_close(int fd); /* Adapter file_write for object callbacks */ template diff --git a/src/send-announce.cc b/src/send-announce.cc index df6830f5c1..4560e89d27 100644 --- a/src/send-announce.cc +++ b/src/send-announce.cc @@ -35,6 +35,7 @@ #include "squid.h" #include "comm/Connection.h" +#include "disk.h" #include "event.h" #include "fde.h" #include "globals.h" diff --git a/src/tools.cc b/src/tools.cc index 078771eff6..c50f9fded1 100644 --- a/src/tools.cc +++ b/src/tools.cc @@ -35,6 +35,7 @@ #include "squid.h" #include "base/Subscription.h" #include "client_side.h" +#include "disk.h" #include "fde.h" #include "fqdncache.h" #include "htcp.h" diff --git a/src/unlinkd.cc b/src/unlinkd.cc index 5d08e7de8c..8428bf04bb 100644 --- a/src/unlinkd.cc +++ b/src/unlinkd.cc @@ -34,6 +34,7 @@ */ #include "squid.h" +#include "disk.h" #include "fde.h" #include "globals.h" #include "xusleep.h"