---------------------
PatchSet 8953 
Date: 2007/02/25 13:36:30
Author: adri
Branch: storework
Tag: (none) 
Log:
The Store reply will always be a HttpReply, so don't declare it as void *.

Members: 
	src/client_side.c:1.168.2.10->1.168.2.11 
	src/typedefs.h:1.42.2.1->1.42.2.2 

Index: squid/src/client_side.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/client_side.c,v
retrieving revision 1.168.2.10
retrieving revision 1.168.2.11
diff -u -r1.168.2.10 -r1.168.2.11
--- squid/src/client_side.c	25 Feb 2007 13:26:24 -0000	1.168.2.10
+++ squid/src/client_side.c	25 Feb 2007 13:36:30 -0000	1.168.2.11
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side.c,v 1.168.2.10 2007/02/25 13:26:24 adri Exp $
+ * $Id: client_side.c,v 1.168.2.11 2007/02/25 13:36:30 adri Exp $
  *
  * DEBUG: section 33    Client-side Routines
  * AUTHOR: Duane Wessels
@@ -385,7 +385,7 @@
  * data. Eventually that'll change to handle both if possible.
  */
 static void
-clientHandleStoreReply(void *data, void *repl, char *buf, squid_off_t repl_offset, ssize_t sz, st_flags_t flags)
+clientHandleStoreReply(void *data, HttpReply *repl, char *buf, squid_off_t repl_offset, ssize_t sz, st_flags_t flags)
 {
 	clientHttpRequest *http = data;
 	StoreEntry *entry = http->entry;
@@ -407,7 +407,7 @@
 	 */
 	if ((flags & ST_CB_REPLY) && (http->reply == NULL)) {
 		assert(repl);
-		clientHandleReply(http, (HttpReply *)repl);
+		clientHandleReply(http, repl);
 		return;
 	}
 
Index: squid/src/typedefs.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/typedefs.h,v
retrieving revision 1.42.2.1
retrieving revision 1.42.2.2
diff -u -r1.42.2.1 -r1.42.2.2
--- squid/src/typedefs.h	25 Feb 2007 13:26:34 -0000	1.42.2.1
+++ squid/src/typedefs.h	25 Feb 2007 13:36:32 -0000	1.42.2.2
@@ -1,6 +1,6 @@
 
 /*
- * $Id: typedefs.h,v 1.42.2.1 2007/02/25 13:26:34 adri Exp $
+ * $Id: typedefs.h,v 1.42.2.2 2007/02/25 13:36:32 adri Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -278,7 +278,7 @@
 typedef void STCB(void *, char *, ssize_t);	/* store callback */
 
 /* new store callback - header, data, flags */
-typedef void ST2CB(void *cbdata, void *reply, char *buf, squid_off_t req_offset, ssize_t req_size, st_flags_t flags);
+typedef void ST2CB(void *cbdata, HttpReply *reply, char *buf, squid_off_t req_offset, ssize_t req_size, st_flags_t flags);
 
 typedef void STABH(void *);
 typedef void ERCB(int fd, void *, size_t);