---------------------
PatchSet 6544 
Date: 2005/03/25 11:54:19
Author: hno
Branch: lfs-2_5
Tag: (none) 
Log:
Fix rebuilding from "old" cache directories.

Members: 
	src/fs/aufs/store_dir_aufs.c:1.23.6.9.8.6->1.23.6.9.8.7 
	src/fs/diskd/store_dir_diskd.c:1.32.6.8.16.5->1.32.6.8.16.6 
	src/fs/ufs/store_dir_ufs.c:1.21.6.10.8.5->1.21.6.10.8.6 

Index: squid/src/fs/aufs/store_dir_aufs.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/fs/aufs/store_dir_aufs.c,v
retrieving revision 1.23.6.9.8.6
retrieving revision 1.23.6.9.8.7
diff -u -r1.23.6.9.8.6 -r1.23.6.9.8.7
--- squid/src/fs/aufs/store_dir_aufs.c	25 Mar 2005 10:34:11 -0000	1.23.6.9.8.6
+++ squid/src/fs/aufs/store_dir_aufs.c	25 Mar 2005 11:54:19 -0000	1.23.6.9.8.7
@@ -476,10 +476,11 @@
 			time_t lastref;
 			time_t expires;
 			time_t lastmod;
-			squid_file_sz swap_file_sz;
+			size_t swap_file_sz;
 			u_short refcount;
 			u_short flags;
 		    } *tmp = t->value;
+		    assert(sizeof(*tmp) == STORE_HDR_METASIZE_OLD);
 		    tmpe.timestamp = tmp->timestamp;
 		    tmpe.lastref = tmp->lastref;
 		    tmpe.expires = tmp->expires;
Index: squid/src/fs/diskd/store_dir_diskd.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/fs/diskd/store_dir_diskd.c,v
retrieving revision 1.32.6.8.16.5
retrieving revision 1.32.6.8.16.6
diff -u -r1.32.6.8.16.5 -r1.32.6.8.16.6
--- squid/src/fs/diskd/store_dir_diskd.c	25 Mar 2005 10:35:45 -0000	1.32.6.8.16.5
+++ squid/src/fs/diskd/store_dir_diskd.c	25 Mar 2005 11:54:20 -0000	1.32.6.8.16.6
@@ -646,10 +646,11 @@
 			time_t lastref;
 			time_t expires;
 			time_t lastmod;
-			squid_file_sz swap_file_sz;
+			size_t swap_file_sz;
 			u_short refcount;
 			u_short flags;
 		    } *tmp = t->value;
+		    assert(sizeof(*tmp) == STORE_HDR_METASIZE_OLD);
 		    tmpe.timestamp = tmp->timestamp;
 		    tmpe.lastref = tmp->lastref;
 		    tmpe.expires = tmp->expires;
Index: squid/src/fs/ufs/store_dir_ufs.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/fs/ufs/store_dir_ufs.c,v
retrieving revision 1.21.6.10.8.5
retrieving revision 1.21.6.10.8.6
diff -u -r1.21.6.10.8.5 -r1.21.6.10.8.6
--- squid/src/fs/ufs/store_dir_ufs.c	25 Mar 2005 10:35:45 -0000	1.21.6.10.8.5
+++ squid/src/fs/ufs/store_dir_ufs.c	25 Mar 2005 11:54:21 -0000	1.21.6.10.8.6
@@ -483,10 +483,11 @@
 			time_t lastref;
 			time_t expires;
 			time_t lastmod;
-			squid_file_sz swap_file_sz;
+			size_t swap_file_sz;
 			u_short refcount;
 			u_short flags;
 		    } *tmp = t->value;
+		    assert(sizeof(*tmp) == STORE_HDR_METASIZE_OLD);
 		    tmpe.timestamp = tmp->timestamp;
 		    tmpe.lastref = tmp->lastref;
 		    tmpe.expires = tmp->expires;