------------------------------------------------------------
revno: 12178
revision-id: squidadm@squid-cache.org-20120617011907-5pcr5wek3j9kcy3c
parent: squid3@treenet.co.nz-20120617000136-smk7vontin3vpcqf
committer: Automatic source maintenance <squidadm@squid-cache.org>
branch nick: trunk
timestamp: Sat 2012-06-16 19:19:07 -0600
message:
  SourceFormat Enforcement
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squidadm@squid-cache.org-20120617011907-\
#   5pcr5wek3j9kcy3c
# target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# testament_sha1: 0ec39bd11fc4f2c45bf174433d4ef25c4e66f91b
# timestamp: 2012-06-17 01:56:33 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# base_revision_id: squid3@treenet.co.nz-20120617000136-\
#   smk7vontin3vpcqf
# 
# Begin patch
=== modified file 'src/acl/Acl.cc'
--- src/acl/Acl.cc	2012-06-16 15:03:46 +0000
+++ src/acl/Acl.cc	2012-06-17 01:19:07 +0000
@@ -323,7 +323,7 @@
 {
     assert (_acl);
     // XXX: AclMatchedName does not contain a matched ACL name when the acl
-    // does not match (or contains stale name if no ACLs are checked). In 
+    // does not match (or contains stale name if no ACLs are checked). In
     // either case, we get misleading debugging and possibly incorrect error
     // messages. Unfortunately, deny_info's "when none http_access
     // lines match" exception essentially requires this mess.

=== modified file 'src/acl/Checklist.cc'
--- src/acl/Checklist.cc	2012-06-16 15:03:46 +0000
+++ src/acl/Checklist.cc	2012-06-17 01:19:07 +0000
@@ -218,7 +218,7 @@
 
         if (resultBeforeAsync == nmrMatch)
             continue;
-        
+
         if (resultBeforeAsync == nmrMismatch || resultBeforeAsync == nmrFinished)
             return false;
 
@@ -236,7 +236,7 @@
         // This is inefficient and ugly, but fixing all match() code, including
         // the code it calls, such as ipcache_nbgethostbyname(), takes time.
         if (!asyncInProgress()) { // failed to start an async operation
-            
+
             if (finished()) {
                 debugs(28, 3, HERE << this << " finished after failing to go async: " << currentAnswer());
                 return false; // an exceptional case
@@ -294,7 +294,7 @@
         assert(!needsAsync);
         debugs(28, 3, HERE << this << " exception: " << currentAnswer());
         return nmrFinished;
-     }
+    }
 
     if (!needsAsync) {
         debugs(28, 3, HERE << this << " simple mismatch");
@@ -395,8 +395,7 @@
     // assume DENY/ALLOW on mis/matches due to not having acl_access object
     if (matchAclList(list, true))
         markFinished(ACCESS_ALLOWED, "all ACLs matched");
-    else
-    if (!finished())
+    else if (!finished())
         markFinished(ACCESS_DENIED, "ACL mismatched");
     PROF_stop(aclCheckFast);
     return currentAnswer();
@@ -442,7 +441,7 @@
 }
 
 /// When no rules matched, the answer is the inversion of the last seen rule
-/// action (or ACCESS_DUNNO if the reversal is not possible). The caller 
+/// action (or ACCESS_DUNNO if the reversal is not possible). The caller
 /// should set lastSeenAction to ACCESS_DUNNO if there were no rules to see.
 void
 ACLChecklist::calcImplicitAnswer(const allow_t &lastSeenAction)

=== modified file 'src/acl/Checklist.h'
--- src/acl/Checklist.h	2012-06-16 15:03:46 +0000
+++ src/acl/Checklist.h	2012-06-17 01:19:07 +0000
@@ -205,7 +205,7 @@
 private: /* internal methods */
     /// possible outcomes when trying to match a single ACL node in a list
     typedef enum { nmrMatch, nmrMismatch, nmrFinished, nmrNeedsAsync }
-        NodeMatchingResult;
+    NodeMatchingResult;
 
     /// prepare for checking ACLs; called once per check
     void preCheck(const char *what);

=== modified file 'src/external_acl.cc'
--- src/external_acl.cc	2012-06-16 15:03:46 +0000
+++ src/external_acl.cc	2012-06-17 01:19:07 +0000
@@ -1398,7 +1398,7 @@
 ExternalACLLookup::Start(ACLChecklist *checklist, external_acl_data *acl, bool inBackground)
 {
     external_acl *def = acl->def;
- 
+
     ACLFilledChecklist *ch = Filled(checklist);
     const char *key = makeExternalAclKey(ch, acl);
     assert(key);

=== modified file 'src/ident/AclIdent.cc'
--- src/ident/AclIdent.cc	2012-06-16 15:03:46 +0000
+++ src/ident/AclIdent.cc	2012-06-17 01:19:07 +0000
@@ -134,9 +134,9 @@
     const ConnStateData *conn = checklist->conn();
     // check that ACLIdent::match() tested this lookup precondition
     assert(conn && Comm::IsConnOpen(conn->clientConnection));
-        debugs(28, 3, HERE << "Doing ident lookup" );
-        checklist->asyncInProgress(true);
-        Ident::Start(checklist->conn()->clientConnection, LookupDone, checklist);
+    debugs(28, 3, HERE << "Doing ident lookup" );
+    checklist->asyncInProgress(true);
+    Ident::Start(checklist->conn()->clientConnection, LookupDone, checklist);
 }
 
 void