--------------------- PatchSet 6469 Date: 2005/03/04 12:05:44 Author: hno Branch: lfs-2_5 Tag: (none) Log: Preserve cache compatibility when --enable-large-files is not used Members: src/store.c:1.16.6.7.6.4->1.16.6.7.6.5 src/structs.h:1.48.2.33.2.7->1.48.2.33.2.8 Index: squid/src/store.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/store.c,v retrieving revision 1.16.6.7.6.4 retrieving revision 1.16.6.7.6.5 diff -u -r1.16.6.7.6.4 -r1.16.6.7.6.5 --- squid/src/store.c 3 Mar 2005 04:43:44 -0000 1.16.6.7.6.4 +++ squid/src/store.c 4 Mar 2005 12:05:44 -0000 1.16.6.7.6.5 @@ -1,6 +1,6 @@ /* - * $Id: store.c,v 1.16.6.7.6.4 2005/03/03 04:43:44 hno Exp $ + * $Id: store.c,v 1.16.6.7.6.5 2005/03/04 12:05:44 hno Exp $ * * DEBUG: section 20 Storage Manager * AUTHOR: Harvest Derived @@ -1158,7 +1158,7 @@ debug(20, l) ("StoreEntry->lastref: %d\n", (int) e->lastref); debug(20, l) ("StoreEntry->expires: %d\n", (int) e->expires); debug(20, l) ("StoreEntry->lastmod: %d\n", (int) e->lastmod); - debug(20, l) ("StoreEntry->swap_file_sz: %d\n", (int) e->swap_file_sz); + debug(20, l) ("StoreEntry->swap_file_sz: %ld\n", (long) e->swap_file_sz); debug(20, l) ("StoreEntry->refcount: %d\n", e->refcount); debug(20, l) ("StoreEntry->flags: %s\n", storeEntryFlags(e)); debug(20, l) ("StoreEntry->swap_dirn: %d\n", (int) e->swap_dirn); Index: squid/src/structs.h =================================================================== RCS file: /cvsroot/squid-sf//squid/src/structs.h,v retrieving revision 1.48.2.33.2.7 retrieving revision 1.48.2.33.2.8 diff -u -r1.48.2.33.2.7 -r1.48.2.33.2.8 --- squid/src/structs.h 3 Mar 2005 04:55:48 -0000 1.48.2.33.2.7 +++ squid/src/structs.h 4 Mar 2005 12:05:45 -0000 1.48.2.33.2.8 @@ -1,6 +1,6 @@ /* - * $Id: structs.h,v 1.48.2.33.2.7 2005/03/03 04:55:48 hno Exp $ + * $Id: structs.h,v 1.48.2.33.2.8 2005/03/04 12:05:45 hno Exp $ * * * SQUID Web Proxy Cache http://www.squid-cache.org/ @@ -1527,7 +1527,7 @@ time_t lastref; time_t expires; time_t lastmod; - squid_off_t swap_file_sz; + off_t swap_file_sz; u_short refcount; u_short flags; /* END OF ON-DISK STORE_META_STD */ @@ -1898,7 +1898,7 @@ time_t lastref; time_t expires; time_t lastmod; - squid_off_t swap_file_sz; + off_t swap_file_sz; u_short refcount; u_short flags; unsigned char key[MD5_DIGEST_CHARS];