------------------------------------------------------------
revno: 13134
revision-id: squidadm@squid-cache.org-20140508001803-oinopeug7zei3e0q
parent: squid3@treenet.co.nz-20140502120822-7hq9axooc6683ezr
committer: Automatic source maintenance <squidadm@squid-cache.org>
branch nick: 3.4
timestamp: Wed 2014-05-07 18:18:03 -0600
message:
  SourceFormat Enforcement
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squidadm@squid-cache.org-20140508001803-\
#   oinopeug7zei3e0q
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
# testament_sha1: b58539acaa40a7ee4382c7241f47a360ec65952e
# timestamp: 2014-05-08 00:53:44 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
# base_revision_id: squid3@treenet.co.nz-20140502120822-\
#   7hq9axooc6683ezr
# 
# Begin patch
=== modified file 'src/acl/Gadgets.cc'
--- src/acl/Gadgets.cc	2014-01-12 01:49:08 +0000
+++ src/acl/Gadgets.cc	2014-05-08 00:18:03 +0000
@@ -53,7 +53,6 @@
 #include <set>
 #include <algorithm>
 
-
 typedef std::set<ACL*> AclSet;
 /// Accumulates all ACLs to facilitate their clean deletion despite reuse.
 static AclSet *RegisteredAcls; // TODO: Remove when ACLs are refcounted

=== modified file 'src/auth/AclMaxUserIp.cc'
--- src/auth/AclMaxUserIp.cc	2013-12-19 09:04:49 +0000
+++ src/auth/AclMaxUserIp.cc	2014-05-08 00:18:03 +0000
@@ -27,7 +27,7 @@
 
 ACLMaxUserIP::ACLMaxUserIP (ACLMaxUserIP const & old) : class_ (old.class_), maximum (old.maximum)
 {
-   flags = old.flags;
+    flags = old.flags;
 }
 
 ACLMaxUserIP::~ACLMaxUserIP()

=== modified file 'src/client_db.cc'
--- src/client_db.cc	2014-02-02 02:41:49 +0000
+++ src/client_db.cc	2014-05-08 00:18:03 +0000
@@ -123,8 +123,8 @@
 
 class ClientDbRr: public RegisteredRunner
 {
-    public:
-        virtual void run(const RunnerRegistry &);
+public:
+    virtual void run(const RunnerRegistry &);
 };
 RunnerRegistrationEntry(rrAfterConfig, ClientDbRr);
 

=== modified file 'src/eui/Eui64.cc'
--- src/eui/Eui64.cc	2014-04-18 18:44:12 +0000
+++ src/eui/Eui64.cc	2014-05-08 00:18:03 +0000
@@ -19,8 +19,8 @@
 Eui::Eui64::decode(const char *asc)
 {
     if (eui64_aton(asc, (struct eui64 *)eui) != 0) {
-       debugs(28, 4, "id=" << (void*)this << " decode fail on " << asc);
-       return false;
+        debugs(28, 4, "id=" << (void*)this << " decode fail on " << asc);
+        return false;
     }
 
     debugs(28, 4, "id=" << (void*)this << " ATON decoded " << asc);

=== modified file 'src/format/Token.cc'
--- src/format/Token.cc	2014-05-02 07:51:33 +0000
+++ src/format/Token.cc	2014-05-08 00:18:03 +0000
@@ -541,24 +541,22 @@
 }
 
 Format::Token::Token() : type(LFT_NONE),
-                         label(NULL),
-                         widthMin(-1),
-                         widthMax(-1),
-                         quote(LOG_QUOTE_NONE),
-                         left(false),
-                         space(false),
-                         zero(false),
-                         divisor(1),
-                         next(NULL)
+        label(NULL),
+        widthMin(-1),
+        widthMax(-1),
+        quote(LOG_QUOTE_NONE),
+        left(false),
+        space(false),
+        zero(false),
+        divisor(1),
+        next(NULL)
 {
     data.string = NULL;
-    data.header.header = NULL; 
+    data.header.header = NULL;
     data.header.element = NULL;
     data.header.separator = ',';
 }
 
-
-
 Format::Token::~Token()
 {
     label = NULL; // drop reference to global static.

=== modified file 'src/http/StatusCode.cc'
--- src/http/StatusCode.cc	2014-04-09 16:53:05 +0000
+++ src/http/StatusCode.cc	2014-05-08 00:18:03 +0000
@@ -7,12 +7,12 @@
 {
     switch (status) {
 
-    // 000
+        // 000
     case Http::scNone:
         return "Init";		/* we init .status with code 0 */
         break;
 
-    // 100-199
+        // 100-199
     case Http::scContinue:
         return "Continue";
         break;
@@ -25,7 +25,7 @@
         return "Processing";
         break;
 
-    // 200-299
+        // 200-299
     case Http::scOkay:
         return "OK";
         break;
@@ -66,7 +66,7 @@
         return "IM Used";
         break;
 
-    // 300-399
+        // 300-399
     case Http::scMultipleChoices:
         return "Multiple Choices";
         break;
@@ -99,7 +99,7 @@
         return "Permanent Redirect";
         break;
 
-    // 400-499
+        // 400-499
     case Http::scBadRequest:
         return "Bad Request";
         break;
@@ -200,7 +200,7 @@
         return "Request Header Fields Too Large";
         break;
 
-    // 500-599
+        // 500-599
     case Http::scInternalServerError:
         return "Internal Server Error";
         break;
@@ -245,7 +245,7 @@
         return "Network Authentication Required";
         break;
 
-    // 600+
+        // 600+
     case Http::scInvalidHeader:
     case Http::scHeaderTooLarge:
         // fall through to default.

=== modified file 'src/main.cc'
--- src/main.cc	2014-03-23 05:00:54 +0000
+++ src/main.cc	2014-05-08 00:18:03 +0000
@@ -501,7 +501,7 @@
                 fatal("Need to add -DMALLOC_DBG when compiling to use -mX option");
 #endif
 
-            } 
+            }
             break;
 
 #if USE_WIN32_SERVICE

=== modified file 'src/ssl/Config.cc'
--- src/ssl/Config.cc	2013-12-15 05:06:25 +0000
+++ src/ssl/Config.cc	2014-05-08 00:18:03 +0000
@@ -5,10 +5,10 @@
 
 Ssl::Config::Config():
 #if USE_SSL_CRTD
-            ssl_crtd(NULL),
+        ssl_crtd(NULL),
 #endif
-            ssl_crt_validator(NULL)
-{ 
+        ssl_crt_validator(NULL)
+{
     ssl_crt_validator_Children.concurrency = 1;
 }
 

=== modified file 'src/tests/stub_libsslsquid.cc'
--- src/tests/stub_libsslsquid.cc	2014-03-04 10:14:42 +0000
+++ src/tests/stub_libsslsquid.cc	2014-05-08 00:18:03 +0000
@@ -12,9 +12,9 @@
 #include "ssl/Config.h"
 Ssl::Config::Config():
 #if USE_SSL_CRTD
-            ssl_crtd(NULL),
+        ssl_crtd(NULL),
 #endif
-            ssl_crt_validator(NULL)
+        ssl_crt_validator(NULL)
 {
     ssl_crt_validator_Children.concurrency = 1;
     STUB_NOP