From: Automatic source maintenance Date: Tue, 14 Jun 2011 00:12:35 +0000 (-0600) Subject: SourceFormat Enforcement X-Git-Tag: take08~55^2~136 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a9336c2372a1126929ef08cdc57acd027142a8f1;p=thirdparty%2Fsquid.git SourceFormat Enforcement --- diff --git a/src/acl/Acl.cc b/src/acl/Acl.cc index 3267826b58..316fdbc6bc 100644 --- a/src/acl/Acl.cc +++ b/src/acl/Acl.cc @@ -130,15 +130,15 @@ ACL::ParseAclLine(ConfigParser &parser, ACL ** head) // Is this ACL going to work? if (strcmp(theType, "myip") != 0) { http_port_list *p = Config.Sockaddr.http; - while(p) { + while (p) { // Bug 3239: not reliable when there is interception traffic coming if (p->intercepted) debugs(28, DBG_CRITICAL, "WARNING: 'myip' ACL is not reliable for interception proxies. Please use 'myportname' instead."); p = p->next; } - } else if(strcmp(theType, "myport") != 0) { + } else if (strcmp(theType, "myport") != 0) { http_port_list *p = Config.Sockaddr.http; - while(p) { + while (p) { // Bug 3239: not reliable when there is interception traffic coming // Bug 3239: myport - not reliable (yet) when there is interception traffic coming if (p->intercepted) diff --git a/src/adaptation/Initiate.cc b/src/adaptation/Initiate.cc index 3d034acaf1..c40dd5bfb9 100644 --- a/src/adaptation/Initiate.cc +++ b/src/adaptation/Initiate.cc @@ -14,12 +14,13 @@ namespace Adaptation typedef UnaryMemFunT AnswerDialer; /// Calls expectNoConsumption() if noteAdaptationAnswer async call is /// scheduled but never fired (e.g., because the HTTP transaction aborts). -class AnswerCall: public AsyncCallT{ +class AnswerCall: public AsyncCallT +{ public: AnswerCall(const char *aName, const AnswerDialer &aDialer) : - AsyncCallT(93, 5, aName, aDialer), fired(false) {} + AsyncCallT(93, 5, aName, aDialer), fired(false) {} virtual void fire() { - fired = true; + fired = true; AsyncCallT::fire(); } virtual ~AnswerCall() { @@ -73,7 +74,7 @@ void Adaptation::Initiate::clearInitiator() void Adaptation::Initiate::sendAnswer(const Answer &answer) { AsyncCall::Pointer call = new AnswerCall("Initiator::noteAdaptationAnswer", - AnswerDialer(theInitiator, &Initiator::noteAdaptationAnswer, answer)); + AnswerDialer(theInitiator, &Initiator::noteAdaptationAnswer, answer)); ScheduleCallHere(call); clearInitiator(); } diff --git a/src/auth/State.h b/src/auth/State.h index 5361e69f8c..15f456b394 100644 --- a/src/auth/State.h +++ b/src/auth/State.h @@ -12,13 +12,13 @@ namespace Auth /** * CBDATA state for NTLM, Negotiate, and Digest stateful authentication. */ -class StateData { +class StateData +{ public: StateData(const AuthUserRequest::Pointer &r, RH *h, void *d) : - data(cbdataReference(d)), - auth_user_request(r), - handler(h) - {} + data(cbdataReference(d)), + auth_user_request(r), + handler(h) {} ~StateData() { auth_user_request = NULL;