---------------------
PatchSet 1271 
Date: 2001/01/10 23:06:46
Author: adri
Branch: modio
Tag: (none) 
Log:


Convert the hash directory structure to the New World Order(tm).

Members: 
	src/fs/hash/store_io_hash.c:1.1.2.3->1.1.2.4 

Index: squid/src/fs/hash/store_io_hash.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/fs/hash/Attic/store_io_hash.c,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- squid/src/fs/hash/store_io_hash.c	6 Jan 2001 14:35:57 -0000	1.1.2.3
+++ squid/src/fs/hash/store_io_hash.c	10 Jan 2001 23:06:46 -0000	1.1.2.4
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store_io_hash.c,v 1.1.2.3 2001/01/06 14:35:57 adri Exp $
+ * $Id: store_io_hash.c,v 1.1.2.4 2001/01/10 23:06:46 adri Exp $
  *
  * DEBUG: section 79    Storage Manager HASH Interface
  * AUTHOR: Duane Wessels
@@ -40,7 +40,7 @@
 static DRCB storeHashReadDone;
 static DWCB storeHashWriteDone;
 static void storeHashIOCallback(storeIOState * sio, int errflag);
-static void storeHashIOFreeEntry(void *, int);
+static void storeHashIOFreeEntry(void *);
 
 /* === PUBLIC =========================================================== */
 
@@ -71,8 +71,7 @@
 	return NULL;
     }
     debug(79, 3) ("storeHashOpen: opened FD %d\n", fd);
-    sio = memAllocate(MEM_STORE_IO);
-    cbdataAdd(sio, storeHashIOFreeEntry, MEM_STORE_IO);
+    sio = CBDATA_ALLOC(storeIOState, storeHashIOFreeEntry);
     sio->fsstate = memPoolAlloc(hash_state_pool);
 
     sio->swap_filen = f;
@@ -121,8 +120,7 @@
 	return NULL;
     }
     debug(79, 3) ("storeHashCreate: opened FD %d\n", fd);
-    sio = memAllocate(MEM_STORE_IO);
-    cbdataAdd(sio, storeHashIOFreeEntry, MEM_STORE_IO);
+    sio = CBDATA_ALLOC(storeIOState, storeHashIOFreeEntry);
     sio->fsstate = memPoolAlloc(hash_state_pool);
 
     sio->swap_filen = filn;
@@ -274,7 +272,7 @@
  * the fsstate variable ..
  */
 static void
-storeHashIOFreeEntry(void *sio, int foo)
+storeHashIOFreeEntry(void *sio)
 {
     memPoolFree(hash_state_pool, ((storeIOState *) sio)->fsstate);
     memFree(sio, MEM_STORE_IO);