--------------------- PatchSet 10172 Date: 2007/11/27 12:09:21 Author: adri Branch: store_copy Tag: (none) Log: Convert a storeClientCopy() from the new header copying work Henrik did over to storeClientRef(). Members: src/client_side.c:1.202.2.7->1.202.2.8 Index: squid/src/client_side.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/client_side.c,v retrieving revision 1.202.2.7 retrieving revision 1.202.2.8 diff -u -r1.202.2.7 -r1.202.2.8 --- squid/src/client_side.c 27 Nov 2007 08:12:25 -0000 1.202.2.7 +++ squid/src/client_side.c 27 Nov 2007 12:09:21 -0000 1.202.2.8 @@ -1,6 +1,6 @@ /* - * $Id: client_side.c,v 1.202.2.7 2007/11/27 08:12:25 adri Exp $ + * $Id: client_side.c,v 1.202.2.8 2007/11/27 12:09:21 adri Exp $ * * DEBUG: section 33 Client-side Routines * AUTHOR: Duane Wessels @@ -169,12 +169,12 @@ /* Temporary here while restructuring stuff */ static void -storeClientCopyHeadersCB(void *data, char *buf, ssize_t size) +storeClientCopyHeadersCB(void *data, mem_node_ref nr, ssize_t size) { clientHttpRequest *http = data; assert(http->header_callback); assert(http->header_entry); - memFree(buf, MEM_STORE_CLIENT_BUF); + stmemNodeUnref(&nr); if (!http->header_entry) return; if (size < 0 || !memHaveHeaders(http->header_entry->mem_obj)) { @@ -189,7 +189,7 @@ clientHttpRequest *http = callback_data; http->header_callback = callback; http->header_entry = e; - storeClientCopy(http->sc, e, 0, 0, STORE_CLIENT_BUF_SZ, memAllocate(MEM_STORE_CLIENT_BUF), storeClientCopyHeadersCB, http); + storeClientRef(http->sc, e, 0, 0, SM_PAGE_SIZE, storeClientCopyHeadersCB, http); } #if USE_IDENT