---------------------
PatchSet 1503 
Date: 2001/02/06 16:07:37
Author: adri
Branch: sfs
Tag: (none) 
Log:


Don't rebuild from swaplog. I forgot to return; after storeRebuildComplete().
Oops.

Members: 
	src/fs/sfs/store_dir_sfs.c:1.1.2.10->1.1.2.11 

Index: squid/src/fs/sfs/store_dir_sfs.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/fs/sfs/Attic/store_dir_sfs.c,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- squid/src/fs/sfs/store_dir_sfs.c	6 Feb 2001 15:43:37 -0000	1.1.2.10
+++ squid/src/fs/sfs/store_dir_sfs.c	6 Feb 2001 16:07:37 -0000	1.1.2.11
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store_dir_sfs.c,v 1.1.2.10 2001/02/06 15:43:37 adri Exp $
+ * $Id: store_dir_sfs.c,v 1.1.2.11 2001/02/06 16:07:37 adri Exp $
  *
  * DEBUG: section 47    Store Directory Routines
  * AUTHOR: Duane Wessels
@@ -497,11 +497,15 @@
     int disk_entry_newer;	/* is the log entry newer than current entry? */
     double x;
     assert(rb != NULL);
-    /* load a number of objects per invocation */
 
     /* We don't do anything right now */
+    store_dirs_rebuilding--;
+    storeSfsDirCloseTmpSwapLog(rb->sd);
     storeRebuildComplete(&rb->counts);
+    cbdataFree(rb);
+    return;
 
+    /* load a number of objects per invocation */
     for (count = 0; count < rb->speed; count++) {
 	if (fread(&s, ss, 1, rb->log) != 1) {
 	    debug(20, 1) ("Done reading %s swaplog (%d entries)\n",