From a48a31d5bd2bec583e9c29248d567226baf311aa Mon Sep 17 00:00:00 2001
From: adrian <>
Date: Mon, 28 Oct 2002 08:12:27 +0000
Subject: [PATCH] move the storeDirCallback() call out into main.cc where it
 probably belongs.

---
 src/comm_poll.cc   | 4 +---
 src/comm_select.cc | 4 +---
 src/main.cc        | 4 +++-
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/comm_poll.cc b/src/comm_poll.cc
index 7ff8be2686..e18d30d0bc 100644
--- a/src/comm_poll.cc
+++ b/src/comm_poll.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: comm_poll.cc,v 1.7 2002/10/13 20:35:00 robertc Exp $
+ * $Id: comm_poll.cc,v 1.8 2002/10/28 01:12:28 adrian Exp $
  *
  * DEBUG: section 5     Socket Functions
  *
@@ -335,8 +335,6 @@ comm_select(int msec)
 	double start;
 	getCurrentTime();
 	start = current_dtime;
-	/* Handle any fs callbacks that need doing */
-	storeDirCallback();
 #if DELAY_POOLS
 	FD_ZERO(&slowfds);
 #endif
diff --git a/src/comm_select.cc b/src/comm_select.cc
index c1441eba0a..7b2dd16234 100644
--- a/src/comm_select.cc
+++ b/src/comm_select.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: comm_select.cc,v 1.62 2002/10/14 11:06:53 adrian Exp $
+ * $Id: comm_select.cc,v 1.63 2002/10/28 01:12:28 adrian Exp $
  *
  * DEBUG: section 5     Socket Functions
  *
@@ -348,8 +348,6 @@ comm_select(int msec)
 #if DELAY_POOLS
 	FD_ZERO(&slowfds);
 #endif
-	/* Handle any fs callbacks that need doing */
-	storeDirCallback();
 	if (commCheckICPIncoming)
 	    comm_select_icp_incoming();
 	if (commCheckDNSIncoming)
diff --git a/src/main.cc b/src/main.cc
index a1a01bab6f..c3af68c384 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: main.cc,v 1.357 2002/10/18 22:43:23 hno Exp $
+ * $Id: main.cc,v 1.358 2002/10/28 01:12:27 adrian Exp $
  *
  * DEBUG: section 1     Startup and Main Loop
  * AUTHOR: Harvest Derived
@@ -718,6 +718,8 @@ main(int argc, char **argv)
 	eventRun();
 	if ((loop_delay = eventNextTime()) < 0)
 	    loop_delay = 0;
+        /* Attempt any pending storedir IO */
+        storeDirCallback();
 	comm_calliocallback();
 	switch (comm_select(loop_delay)) {
 	case COMM_OK:
-- 
2.47.3