moved disk.cc-related headers to new disk.h

diff --git a/src/DiskIO/AIO/AIODiskFile.cc b/src/DiskIO/AIO/AIODiskFile.cc
index fa2132f8ed5cc052e90cb5214d4a604ad1409df3..1d51d5bd352a373d460a2f1665aeae5cb73ed9d4 100644 (file)
--- 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 38e5b613af5fc04aab7d70937bbcd1e55f9ac2a2..5bfa3d2511fe3ffbd8050a187fc0ede6bed366cf 100644 (file)
--- 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 0edfb256375af36c72800a3a582a5037ff68a115..89ee7df28ca91609c8c83e2dc8a1d28277915ce5 100644 (file)
--- 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 71a7ce783360b189c00dbaabc196e9f5d9eb03d3..cac9fc982eab52ba5736810941e7460f531b0334 100644 (file)
--- 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 8e0084b421d00b70173e674ba397656bff0ce926..03e8a08e86dbd13fcc94dbc5bde7e23c683a496d 100644 (file)
--- 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 3903ababd8664885591ff64e9230fcbf7a22b615..679258a4d4a59de25953a5d93a7ba8b6b1fd736b 100644 (file)
--- 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 (file)
index 0000000..6848004
--- /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 1d60e8ad1cae778a871fadb9898aa2079555374f..5de5d3a5787a9606114fe4e17533df4b8834fbb5 100644 (file)
--- 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 f9ceeb5a6341dbd27d8142f3c7afb0bdcc1c04cc..3e84034ed5dfc6c65c2b05c6593a8a3313c7bd77 100644 (file)
--- 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 94e84b157055f191ea38cd1774ee016745f1c452..0d62591d1585b469dcd021c366d6e69af6153983 100644 (file)
--- 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 f0c5767e2696c2d8442c4b776fa78b7ebf072606..28f694b8f9c75af4af858b9763b56dca9259307b 100644 (file)
--- 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 84218a6988132e91976e9bfb347b6c0a2540583f..0e2b8162cb3d443f8743fd600e68051f23b9e431 100644 (file)
--- 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 0f75f7221c13faa41d471f3f874b3db8a81ab4b4..3ed9dc97a5ebcb189da3f25e993bf42bed0e3eea 100644 (file)
--- 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 0de3d88ccf83bcd46316e5c75a67f2545d4618de..abe76f073888e746c4c63535a12e9a2ea5754fb2 100644 (file)
--- 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 ab27445f46e22cfddda19db1b5a561c382ab5bde..0d460b0d8e73f92087b165a166da0679f578cde5 100644 (file)
--- 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 e470714ba26ab74456b1b7ca754a470b09b515c8..15b3115cd559ace7a009b7fad069ceb86be91603 100644 (file)
--- 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 85f568046cc493a0c716bc00d14b294318bda9e7..502da17b9590e37f97eec7318469894cb46fbb68 100644 (file)
--- 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 27fd3821fb1929cc4584020889d132a033749815..aab0d6b5565e67cb51943acc2f4d7d2f9ac3d6d9 100644 (file)
--- 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 3292f79d69f0cf6ce0b102b73f5019e2985f62c0..c4a1511b43317d32b2d048b99acaadc78c830a8b 100644 (file)
--- 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 <class O>

diff --git a/src/send-announce.cc b/src/send-announce.cc
index df6830f5c19d5d4fc51cf259ff77cd8d5d7d796f..4560e89d27523fd1d3e5494ce34b7bca908bd5e1 100644 (file)
--- 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 078771eff6c8ed458609978081dae64571e0ae2d..c50f9fded1f0f440fa6459fa0b097cc141a32a81 100644 (file)
--- 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 5d08e7de8c89f27c856d737aef1a8b8c40a16c5c..8428bf04bb263b129f9673889b35b4beadcddb02 100644 (file)
--- 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"