------------------------------------------------------------ revno: 11648 revision-id: squidadm@squid-cache.org-20110815001218-uprxug4tbryh8fpe parent: squid3@treenet.co.nz-20110814233426-043ss6ykiv7z4jr4 committer: Automatic source maintenance branch nick: trunk timestamp: Sun 2011-08-14 18:12:18 -0600 message: SourceFormat Enforcement ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squidadm@squid-cache.org-20110815001218-\ # uprxug4tbryh8fpe # target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # testament_sha1: 129f1e18d1e8cdafe0f853b40a492f8e5064b7ee # timestamp: 2011-08-15 00:52:28 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # base_revision_id: squid3@treenet.co.nz-20110814233426-\ # 043ss6ykiv7z4jr4 # # Begin patch === modified file 'src/auth/AclMaxUserIp.cc' --- src/auth/AclMaxUserIp.cc 2011-08-14 12:18:57 +0000 +++ src/auth/AclMaxUserIp.cc 2011-08-15 00:12:18 +0000 @@ -155,8 +155,7 @@ int ti; // convert to tri-state ACL match 1,0,-1 - switch(answer) - { + switch (answer) { case ACCESS_ALLOWED: case ACCESS_AUTH_EXPIRED_OK: // check for a match === modified file 'src/auth/AclProxyAuth.cc' --- src/auth/AclProxyAuth.cc 2011-08-14 12:18:57 +0000 +++ src/auth/AclProxyAuth.cc 2011-08-15 00:12:18 +0000 @@ -83,8 +83,7 @@ checklist->currentAnswer(answer); // convert to tri-state ACL match 1,0,-1 - switch(answer) - { + switch (answer) { case ACCESS_ALLOWED: case ACCESS_AUTH_EXPIRED_OK: // check for a match === modified file 'src/external_acl.cc' --- src/external_acl.cc 2011-08-14 11:40:33 +0000 +++ src/external_acl.cc 2011-08-15 00:12:18 +0000 @@ -850,8 +850,7 @@ checklist->currentAnswer(answer); // convert to tri-state ACL match 1,0,-1 - switch(answer) - { + switch (answer) { case ACCESS_ALLOWED: case ACCESS_AUTH_EXPIRED_OK: return 1; // match