------------------------------------------------------------
revno: 11487
revision-id: squidadm@squid-cache.org-20110614001235-jlf330l5cs7qcmi5
parent: chtsanti@users.sourceforge.net-20110613180433-aca6c7lxdrgy4z3e
committer: Automatic source maintenance <squidadm@squid-cache.org>
branch nick: trunk
timestamp: Mon 2011-06-13 18:12:35 -0600
message:
  SourceFormat Enforcement
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squidadm@squid-cache.org-20110614001235-\
#   jlf330l5cs7qcmi5
# target_branch: http://www.squid-cache.org/bzr/squid3/trunk/
# testament_sha1: d42fb57bd929d0eeafa9bee175a349709a52690b
# timestamp: 2011-06-14 00:54:02 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# base_revision_id: chtsanti@users.sourceforge.net-20110613180433-\
#   aca6c7lxdrgy4z3e
# 
# Begin patch
=== modified file 'src/acl/Acl.cc'
--- src/acl/Acl.cc	2011-06-13 12:22:21 +0000
+++ src/acl/Acl.cc	2011-06-14 00:12:35 +0000
@@ -130,15 +130,15 @@
     // 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)

=== modified file 'src/adaptation/Initiate.cc'
--- src/adaptation/Initiate.cc	2011-06-13 18:04:33 +0000
+++ src/adaptation/Initiate.cc	2011-06-14 00:12:35 +0000
@@ -14,12 +14,13 @@
 typedef UnaryMemFunT<Initiator, Answer, const Answer &> AnswerDialer;
 /// Calls expectNoConsumption() if noteAdaptationAnswer async call is
 /// scheduled but never fired (e.g., because the HTTP transaction aborts).
-class AnswerCall: public AsyncCallT<AnswerDialer>{
+class AnswerCall: public AsyncCallT<AnswerDialer>
+{
 public:
     AnswerCall(const char *aName, const AnswerDialer &aDialer) :
-        AsyncCallT<AnswerDialer>(93, 5, aName, aDialer), fired(false) {}
+            AsyncCallT<AnswerDialer>(93, 5, aName, aDialer), fired(false) {}
     virtual void fire() {
-        fired = true; 
+        fired = true;
         AsyncCallT<AnswerDialer>::fire();
     }
     virtual ~AnswerCall() {
@@ -73,7 +74,7 @@
 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();
 }

=== modified file 'src/auth/State.h'
--- src/auth/State.h	2011-06-13 12:25:12 +0000
+++ src/auth/State.h	2011-06-14 00:12:35 +0000
@@ -12,13 +12,13 @@
 /**
  * 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;