Adjusted the sizes of swap_filen and swap_dirn to the old ones (24, 8). This

saves us 4 bytes per StoreEntry.

diff --git a/src/structs.h b/src/structs.h
index efcec9825e0e8f4181a00afac82f9cc9dee83203..12047626a3c2f3619810fc977adee4a1060e7479 100644 (file)
--- a/src/structs.h
+++ b/src/structs.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: structs.h,v 1.376 2001/01/09 01:13:36 wessels Exp $
+ * $Id: structs.h,v 1.377 2001/01/09 01:43:08 hno Exp $
  *
  *
  * SQUID Internet Object Cache  http://squid.nlanr.net/Squid/
@@ -1434,16 +1434,16 @@ struct _MemObject {
 struct _StoreEntry {
     hash_link hash;            /* must be first */
     MemObject *mem_obj;
+    RemovalPolicyNode repl;
     time_t timestamp;
     time_t lastref;
     time_t expires;
     time_t lastmod;
     size_t swap_file_sz;
+    sfileno swap_filen:24;
+    sdirno swap_dirn:8;
     u_short refcount;
     u_short flags;
-    sdirno swap_dirn;
-    sfileno swap_filen;
-    RemovalPolicyNode repl;
     u_short lock_count;                /* Assume < 65536! */
     mem_status_t mem_status:3;
     ping_status_t ping_status:3;

diff --git a/src/typedefs.h b/src/typedefs.h
index 5d784b21f150e9e3eabdce6e5bb53d6dd9df2b70..09aa0c2ee041c3f5386476d600f1409269e4d1a2 100644 (file)
--- a/src/typedefs.h
+++ b/src/typedefs.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: typedefs.h,v 1.117 2001/01/08 19:36:27 hno Exp $
+ * $Id: typedefs.h,v 1.118 2001/01/09 01:43:08 hno Exp $
  *
  *
  * SQUID Internet Object Cache  http://squid.nlanr.net/Squid/
@@ -39,7 +39,7 @@ typedef unsigned int mem_status_t;
 typedef unsigned int ping_status_t;
 typedef unsigned int swap_status_t;
 typedef int sfileno;
-typedef int sdirno;
+typedef char sdirno;
 
 typedef struct {
     size_t bytes;