--------------------- PatchSet 11341 Date: 2007/03/15 10:05:28 Author: hno Branch: HEAD Tag: (none) Log: Undo an accidental name change of storeUnregisterAbort. The Store client API cleanup change on 2006/06/05 22:47:01 accidently renamed storeUnregisterAbort to storeClientUnregisterAbort in an automated search/replace. Members: src/forward.c:1.124->1.125 src/protos.h:1.527->1.528 src/store.c:1.577->1.578 Index: squid/src/forward.c =================================================================== RCS file: /cvsroot/squid/squid/src/forward.c,v retrieving revision 1.124 retrieving revision 1.125 diff -u -r1.124 -r1.125 --- squid/src/forward.c 14 Mar 2007 22:43:25 -0000 1.124 +++ squid/src/forward.c 15 Mar 2007 10:05:28 -0000 1.125 @@ -1,6 +1,6 @@ /* - * $Id: forward.c,v 1.124 2007/03/14 22:43:25 hno Exp $ + * $Id: forward.c,v 1.125 2007/03/15 10:05:28 hno Exp $ * * DEBUG: section 17 Request Forwarding * AUTHOR: Duane Wessels @@ -120,7 +120,7 @@ fwdState->request = NULL; if (fwdState->err) errorStateFree(fwdState->err); - storeClientUnregisterAbort(e); + storeUnregisterAbort(e); storeUnlockObject(e); fwdState->entry = NULL; sfd = fwdState->server_fd; Index: squid/src/protos.h =================================================================== RCS file: /cvsroot/squid/squid/src/protos.h,v retrieving revision 1.527 retrieving revision 1.528 diff -u -r1.527 -r1.528 --- squid/src/protos.h 14 Mar 2007 22:43:25 -0000 1.527 +++ squid/src/protos.h 15 Mar 2007 10:05:28 -0000 1.528 @@ -1,6 +1,6 @@ /* - * $Id: protos.h,v 1.527 2007/03/14 22:43:25 hno Exp $ + * $Id: protos.h,v 1.528 2007/03/15 10:05:28 hno Exp $ * * * SQUID Web Proxy Cache http://www.squid-cache.org/ @@ -924,7 +924,7 @@ extern int storeEntryValidToSend(StoreEntry *); extern void storeTimestampsSet(StoreEntry *); extern void storeRegisterAbort(StoreEntry * e, STABH * cb, void *); -extern void storeClientUnregisterAbort(StoreEntry * e); +extern void storeUnregisterAbort(StoreEntry * e); extern void storeMemObjectDump(MemObject * mem); extern void storeEntryDump(const StoreEntry * e, int debug_lvl); extern const char *storeUrl(const StoreEntry *); Index: squid/src/store.c =================================================================== RCS file: /cvsroot/squid/squid/src/store.c,v retrieving revision 1.577 retrieving revision 1.578 diff -u -r1.577 -r1.578 --- squid/src/store.c 11 Mar 2007 22:58:44 -0000 1.577 +++ squid/src/store.c 15 Mar 2007 10:05:29 -0000 1.578 @@ -1,6 +1,6 @@ /* - * $Id: store.c,v 1.577 2007/03/11 22:58:44 hno Exp $ + * $Id: store.c,v 1.578 2007/03/15 10:05:29 hno Exp $ * * DEBUG: section 20 Storage Manager * AUTHOR: Harvest Derived @@ -1717,7 +1717,7 @@ } void -storeClientUnregisterAbort(StoreEntry * e) +storeUnregisterAbort(StoreEntry * e) { MemObject *mem = e->mem_obj; assert(mem);