HEAD patches

Hi,

Here are a couple of quick fixes to HEAD.
The first one (store_log.c) stops logging the RELEASE calls when
we're rebuilding. The second couple patch sfileno to be 32bits
everywhere, and turns sdirno into an 8 bit number.

It bloats the StoreEntry a little, but it allows COSS to work
on dirs up to 2gig. As I said before, I'd like to fix this
by just throwing in Andre's slab allocator.

Comments? I'd like to commit this so the COSS stuff is testable by
people.

Thanks!

Adrian

Index: src/store_log.c
===================================================================
RCS file: /server/cvs-server/squid/squid/src/store_log.c,v
retrieving revision 1.22
diff -u -r1.22 store_log.c
--- src/store_log.c 2001/02/17 07:28:50 1.22
+++ src/store_log.c 2001/08/12 10:43:59
@@ -53,6 +53,8 @@
     HttpReply *reply;
     if (NULL == storelog)
         return;
+ if (e->swap_filen == -1 && e->swap_dirn == -1 && store_dirs_rebuilding)
+ return; /* We're rebuilding! */
 #if UNUSED_CODE
     if (EBIT_TEST(e->flags, ENTRY_DONT_LOG))
         return;
Index: src/structs.h
===================================================================
RCS file: /server/cvs-server/squid/squid/src/structs.h,v
retrieving revision 1.396
diff -u -r1.396 structs.h
--- src/structs.h 2001/08/03 15:13:04 1.396
+++ src/structs.h 2001/08/12 10:44:00
@@ -1487,8 +1487,8 @@
     time_t expires;
     time_t lastmod;
     size_t swap_file_sz;
- sfileno swap_filen:25;
- sdirno swap_dirn:7;
+ sfileno swap_filen;
+ sdirno swap_dirn;
     u_short refcount;
     u_short flags;
     u_short lock_count; /* Assume < 65536! */
Index: src/typedefs.h
===================================================================
RCS file: /server/cvs-server/squid/squid/src/typedefs.h,v
retrieving revision 1.130
diff -u -r1.130 typedefs.h
--- src/typedefs.h 2001/08/03 15:13:04 1.130
+++ src/typedefs.h 2001/08/12 10:44:00
@@ -39,7 +39,7 @@
 typedef unsigned int ping_status_t;
 typedef unsigned int swap_status_t;
 typedef signed int sfileno;
-typedef signed int sdirno;
+typedef signed char sdirno;
 
 typedef struct {
     size_t bytes;

----- End forwarded message -----

-- 
Adrian Chadd			Yeah, for me its (XML) like the movie Titanic.
<adrian@creative.net.au>	  Everybody loves it.
				    I want to be different, so I hate it.
					--Duane Wessels