From: wessels <>
Date: Wed, 18 Feb 1998 06:04:03 +0000 (+0000)
Subject: move aioClose() init to disk_init
X-Git-Tag: SQUID_3_0_PRE1~4078
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=04cece06899644645ad544935bff3e1eb197be1f;p=thirdparty%2Fsquid.git

move aioClose() init to disk_init
---

diff --git a/src/disk.cc b/src/disk.cc
index 2e843fb805..fb05b0e265 100644
--- a/src/disk.cc
+++ b/src/disk.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: disk.cc,v 1.104 1998/02/10 00:55:03 wessels Exp $
+ * $Id: disk.cc,v 1.105 1998/02/17 23:04:03 wessels Exp $
  *
  * DEBUG: section 6     Disk I/O Routines
  * AUTHOR: Harvest Derived
@@ -126,11 +126,12 @@ static PF diskHandleRead;
 static PF diskHandleWrite;
 static void file_open_complete(void *, int, int);
 
-/* initialize table */
-int
+void
 disk_init(void)
 {
-    return 0;
+#if USE_ASYNC_IO
+    aioClose(dup(0));
+#endif
 }
 
 /* Open a disk file. Return a file descriptor */
diff --git a/src/main.cc b/src/main.cc
index cedd78b3b5..62f108b230 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: main.cc,v 1.220 1998/02/17 19:12:06 wessels Exp $
+ * $Id: main.cc,v 1.221 1998/02/17 23:04:04 wessels Exp $
  *
  * DEBUG: section 1     Startup and Main Loop
  * AUTHOR: Harvest Derived
@@ -436,9 +436,6 @@ mainInitialize(void)
 	memInit();		/* memInit must go before at least redirect */
 	disk_init();		/* disk_init must go before ipcache_init() */
     }
-#if USE_ASYNC_IO
-    aioClose(dup(0));		/* cough */
-#endif
     ipcache_init();
     fqdncache_init();
     dnsOpenServers();
diff --git a/src/protos.h b/src/protos.h
index 2415f4c6d4..ac4256396d 100644
--- a/src/protos.h
+++ b/src/protos.h
@@ -126,7 +126,7 @@ extern int file_open(const char *path, int mode, FOCB *, void *callback_data, vo
 extern void file_close(int fd);
 extern void file_write(int, off_t, void *, int len, DWCB *, void *, FREE *);
 extern int file_read(int, char *, int, off_t, DRCB *, void *);
-extern int disk_init(void);
+extern void disk_init(void);
 extern int diskWriteIsComplete(int);
 
 extern void dnsShutdownServers(void);