--------------------- PatchSet 1629 Date: 2005/08/31 19:39:10 Author: dwsquid Branch: squid3-icap Tag: (none) Log: applied astyle Members: src/ICAPAnchor.cc:1.1.2.20->1.1.2.21 src/MemBuf.cci:1.2.20.1->1.2.20.2 Index: squid3/src/ICAPAnchor.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/Attic/ICAPAnchor.cc,v retrieving revision 1.1.2.20 retrieving revision 1.1.2.21 diff -u -r1.1.2.20 -r1.1.2.21 --- squid3/src/ICAPAnchor.cc 26 Aug 2005 23:33:25 -0000 1.1.2.20 +++ squid3/src/ICAPAnchor.cc 31 Aug 2005 19:39:10 -0000 1.1.2.21 @@ -23,17 +23,20 @@ stop(notifyNone); cbdataReferenceDone(httpState); debug(93,5)("ICAPAnchor destructed, this=%p\n", this); + if (virgin) { - delete virgin->data->body; - delete virgin->data; - leakFree(virgin, leaky); - delete virgin; + delete virgin->data->body; + delete virgin->data; + leakFree(virgin, leaky); + delete virgin; } + if (adapted) { - delete adapted->data; - leakFree(adapted, leaky); - delete adapted; + delete adapted->data; + leakFree(adapted, leaky); + delete adapted; } + leaky->dump(); } @@ -118,6 +121,7 @@ debug(93,5)("ICAPAnchor::noteSinkNeed() called\n"); leakTouch(virgin, leaky); + if (virgin->data->body->potentialSpaceSize()) httpState->icapSpaceAvailable(); } @@ -176,10 +180,14 @@ virgin->source = NULL; // this is the place to decrement refcount ptr - delete virgin->data->body; - delete virgin->data; - leakFree(virgin, leaky); - delete virgin; + delete virgin->data->body; + + delete virgin->data; + + leakFree(virgin, leaky); + + delete virgin; + virgin = NULL; } @@ -190,8 +198,10 @@ adapted->sink = NULL; // this is the place to decrement refcount ptr - delete adapted->data; - leakFree(adapted, leaky); + delete adapted->data; + + leakFree(adapted, leaky); + adapted = NULL; } Index: squid3/src/MemBuf.cci =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/MemBuf.cci,v retrieving revision 1.2.20.1 retrieving revision 1.2.20.2 diff -u -r1.2.20.1 -r1.2.20.2 --- squid3/src/MemBuf.cci 24 Aug 2005 21:26:17 -0000 1.2.20.1 +++ squid3/src/MemBuf.cci 31 Aug 2005 19:39:10 -0000 1.2.20.2 @@ -1,6 +1,6 @@ /* - * $Id: MemBuf.cci,v 1.2.20.1 2005/08/24 21:26:17 dwsquid Exp $ + * $Id: MemBuf.cci,v 1.2.20.2 2005/08/31 19:39:10 dwsquid Exp $ * * DEBUG: section 59 auto-growing Memory Buffer with printf * AUTHOR: Robert Collins @@ -34,10 +34,9 @@ */ MemBuf::MemBuf() : buf (NULL), size (0), max_capacity (0), capacity(0), stolen(0), valid(1) -{ -} +{} MemBuf::~MemBuf() { - valid = 0; + valid = 0; }