From: Automatic source maintenance <squidadm@squid-cache.org>
Date: Thu, 8 May 2014 00:18:03 +0000 (-0600)
Subject: SourceFormat Enforcement
X-Git-Tag: SQUID_3_4_6~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f223d76bce82937ca3ce599ccf4b492241b4638;p=thirdparty%2Fsquid.git

SourceFormat Enforcement
---

diff --git a/src/acl/Gadgets.cc b/src/acl/Gadgets.cc
index c35867532c..1764be7f57 100644
--- a/src/acl/Gadgets.cc
+++ b/src/acl/Gadgets.cc
@@ -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
diff --git a/src/auth/AclMaxUserIp.cc b/src/auth/AclMaxUserIp.cc
index cd4ec1f3ec..381cd3a3a3 100644
--- a/src/auth/AclMaxUserIp.cc
+++ b/src/auth/AclMaxUserIp.cc
@@ -27,7 +27,7 @@ ACLMaxUserIP::ACLMaxUserIP (char const *theClass) : ACL(SupportedFlags), class_
 
 ACLMaxUserIP::ACLMaxUserIP (ACLMaxUserIP const & old) : class_ (old.class_), maximum (old.maximum)
 {
-   flags = old.flags;
+    flags = old.flags;
 }
 
 ACLMaxUserIP::~ACLMaxUserIP()
diff --git a/src/client_db.cc b/src/client_db.cc
index c24fff51d6..9e1132c6db 100644
--- a/src/client_db.cc
+++ b/src/client_db.cc
@@ -123,8 +123,8 @@ clientdbInit(void)
 
 class ClientDbRr: public RegisteredRunner
 {
-    public:
-        virtual void run(const RunnerRegistry &);
+public:
+    virtual void run(const RunnerRegistry &);
 };
 RunnerRegistrationEntry(rrAfterConfig, ClientDbRr);
 
diff --git a/src/eui/Eui64.cc b/src/eui/Eui64.cc
index 1c98299e37..385529d4ce 100644
--- a/src/eui/Eui64.cc
+++ b/src/eui/Eui64.cc
@@ -19,8 +19,8 @@ bool
 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);
diff --git a/src/format/Token.cc b/src/format/Token.cc
index 6f67b144e7..96d3218eff 100644
--- a/src/format/Token.cc
+++ b/src/format/Token.cc
@@ -541,24 +541,22 @@ done:
 }
 
 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.
diff --git a/src/http/StatusCode.cc b/src/http/StatusCode.cc
index 4afbcc7e07..854492ba4b 100644
--- a/src/http/StatusCode.cc
+++ b/src/http/StatusCode.cc
@@ -7,12 +7,12 @@ Http::StatusCodeString(const Http::StatusCode status)
 {
     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 @@ Http::StatusCodeString(const Http::StatusCode status)
         return "Processing";
         break;
 
-    // 200-299
+        // 200-299
     case Http::scOkay:
         return "OK";
         break;
@@ -66,7 +66,7 @@ Http::StatusCodeString(const Http::StatusCode status)
         return "IM Used";
         break;
 
-    // 300-399
+        // 300-399
     case Http::scMultipleChoices:
         return "Multiple Choices";
         break;
@@ -99,7 +99,7 @@ Http::StatusCodeString(const Http::StatusCode status)
         return "Permanent Redirect";
         break;
 
-    // 400-499
+        // 400-499
     case Http::scBadRequest:
         return "Bad Request";
         break;
@@ -200,7 +200,7 @@ Http::StatusCodeString(const Http::StatusCode status)
         return "Request Header Fields Too Large";
         break;
 
-    // 500-599
+        // 500-599
     case Http::scInternalServerError:
         return "Internal Server Error";
         break;
@@ -245,7 +245,7 @@ Http::StatusCodeString(const Http::StatusCode status)
         return "Network Authentication Required";
         break;
 
-    // 600+
+        // 600+
     case Http::scInvalidHeader:
     case Http::scHeaderTooLarge:
         // fall through to default.
diff --git a/src/main.cc b/src/main.cc
index 462eb73b72..59825577c6 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -501,7 +501,7 @@ mainParseOptions(int argc, char *argv[])
                 fatal("Need to add -DMALLOC_DBG when compiling to use -mX option");
 #endif
 
-            } 
+            }
             break;
 
 #if USE_WIN32_SERVICE
diff --git a/src/ssl/Config.cc b/src/ssl/Config.cc
index f730e03c82..32dd1f3ecd 100644
--- a/src/ssl/Config.cc
+++ b/src/ssl/Config.cc
@@ -5,10 +5,10 @@ Ssl::Config Ssl::TheConfig;
 
 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;
 }
 
diff --git a/src/tests/stub_libsslsquid.cc b/src/tests/stub_libsslsquid.cc
index 3ab73aa33a..d1eb5f83f1 100644
--- a/src/tests/stub_libsslsquid.cc
+++ b/src/tests/stub_libsslsquid.cc
@@ -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