--------------------- PatchSet 3841 Date: 2006/10/06 17:53:48 Author: rousskov Branch: squid3-icap Tag: (none) Log: - Removed tabs. Argh! Members: src/ICAP/ICAPClientRespmodPrecache.cc:1.1.2.4->1.1.2.5 src/ICAP/ICAPClientVector.cc:1.1.2.1->1.1.2.2 src/ICAP/ICAPXaction.h:1.1.2.3->1.1.2.4 src/ICAP/MsgPipe.cc:1.1.2.3->1.1.2.4 src/ICAP/TextException.h:1.1.2.1->1.1.2.2 Index: squid3/src/ICAP/ICAPClientRespmodPrecache.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/ICAP/ICAPClientRespmodPrecache.cc,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -u -r1.1.2.4 -r1.1.2.5 --- squid3/src/ICAP/ICAPClientRespmodPrecache.cc 6 Oct 2006 16:43:03 -0000 1.1.2.4 +++ squid3/src/ICAP/ICAPClientRespmodPrecache.cc 6 Oct 2006 17:53:48 -0000 1.1.2.5 @@ -29,9 +29,9 @@ HttpReply *reply = dynamic_cast(adapted->data->header); /* - * The ICAP reply MUST have a new HTTP reply header, or else - * it is an invalid ICAP message. Invalid ICAP messages should - * be handled prior to this point. + * The ICAP reply MUST have a new HTTP reply header, or else + * it is an invalid ICAP message. Invalid ICAP messages should + * be handled prior to this point. */ assert(reply); // check that ICAP xaction created the right object assert(reply == adapted->data->header); @@ -45,7 +45,7 @@ bool expect_body = reply->expectingBody(virgin->data->cause->method, dummy); if (!serverState->takeAdaptedHeaders(reply)) // deletes us - return; + return; if (expect_body) noteSourceProgress(p); @@ -63,7 +63,7 @@ if (p->data->body->hasContent()) { if (!serverState->takeAdaptedBody(p->data->body)) - return; + return; // HttpStateData::takeAdaptedBody does not detect when we have enough, // so we always notify source that there more buffer space is available Index: squid3/src/ICAP/ICAPClientVector.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/ICAP/ICAPClientVector.cc,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- squid3/src/ICAP/ICAPClientVector.cc 6 Oct 2006 16:43:03 -0000 1.1.2.1 +++ squid3/src/ICAP/ICAPClientVector.cc 6 Oct 2006 17:53:48 -0000 1.1.2.2 @@ -135,16 +135,16 @@ if (virgin != NULL) { if (notify == notifyIcap) virgin->sendSourceAbort(); - else - virgin->source = NULL; + else + virgin->source = NULL; virgin = NULL; // refcounted } if (cleanAdapted && adapted != NULL) { if (notify == notifyIcap) adapted->sendSinkAbort(); - else - adapted->sink = NULL; + else + adapted->sink = NULL; adapted = NULL; // refcounted } @@ -153,8 +153,8 @@ if (theOwner) { if (notify == notifyOwner) tellAbortAdapting(); // deletes us - else - cbdataReferenceDone(theOwner); + else + cbdataReferenceDone(theOwner); } // not safe to do anything here because we may have been deleted. Index: squid3/src/ICAP/ICAPXaction.h =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/ICAP/ICAPXaction.h,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- squid3/src/ICAP/ICAPXaction.h 4 Oct 2006 05:00:23 -0000 1.1.2.3 +++ squid3/src/ICAP/ICAPXaction.h 6 Oct 2006 17:53:48 -0000 1.1.2.4 @@ -1,6 +1,6 @@ /* - * $Id: ICAPXaction.h,v 1.1.2.3 2006/10/04 05:00:23 rousskov Exp $ + * $Id: ICAPXaction.h,v 1.1.2.4 2006/10/06 17:53:48 rousskov Exp $ * * * SQUID Web Proxy Cache http://www.squid-cache.org/ @@ -153,20 +153,20 @@ // - open the try clause; // - call callStart(). #define ICAPXaction_Enter(method) \ - try { \ - if (!callStart(#method)) \ - return; + try { \ + if (!callStart(#method)) \ + return; // asynchronous call exit: // - close the try clause; // - catch exceptions; // - let callEnd() handle transaction termination conditions #define ICAPXaction_Exit() \ - } \ - catch (const TextException &e) { \ - callException(e); \ - } \ - callEnd(); + } \ + catch (const TextException &e) { \ + callException(e); \ + } \ + callEnd(); #endif /* SQUID_ICAPXACTION_H */ Index: squid3/src/ICAP/MsgPipe.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/ICAP/MsgPipe.cc,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- squid3/src/ICAP/MsgPipe.cc 4 Oct 2006 19:34:05 -0000 1.1.2.3 +++ squid3/src/ICAP/MsgPipe.cc 6 Oct 2006 17:53:48 -0000 1.1.2.4 @@ -11,9 +11,9 @@ #define MsgPipe_MAKE_CALLBACK(callName, destination) \ static \ void MsgPipe_send ## callName(void *p) { \ - MsgPipe *pipe = static_cast(p); \ - if (pipe && pipe->canSend(pipe->destination, #callName, false)) \ - pipe->destination->note##callName(pipe); \ + MsgPipe *pipe = static_cast(p); \ + if (pipe && pipe->canSend(pipe->destination, #callName, false)) \ + pipe->destination->note##callName(pipe); \ } // static event callbacks Index: squid3/src/ICAP/TextException.h =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/ICAP/TextException.h,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- squid3/src/ICAP/TextException.h 21 Nov 2005 21:05:51 -0000 1.1.2.1 +++ squid3/src/ICAP/TextException.h 6 Oct 2006 17:53:48 -0000 1.1.2.2 @@ -27,20 +27,20 @@ //inline //ostream &operator <<(ostream &os, const TextException &exx) { -// return exx.print(os); +// return exx.print(os); //} #if !defined(TexcHere) -# define TexcHere(msg) TextException((msg), __FILE__, __LINE__) +# define TexcHere(msg) TextException((msg), __FILE__, __LINE__) #endif extern void Throw(const char *message, const char *fileName, int lineNo); // Must(condition) is like assert(condition) but throws an exception instead #if !defined(Must) -# define Must(cond) ((cond) ? \ - (void)0 : \ - (void)Throw(#cond, __FILE__, __LINE__)) +# define Must(cond) ((cond) ? \ + (void)0 : \ + (void)Throw(#cond, __FILE__, __LINE__)) #endif #endif /* SQUID__TEXTEXCEPTION_H */