]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
SourceFormat Enforcement
authorAutomatic source maintenance <squidadm@squid-cache.org>
Thu, 8 May 2014 00:18:03 +0000 (18:18 -0600)
committerAutomatic source maintenance <squidadm@squid-cache.org>
Thu, 8 May 2014 00:18:03 +0000 (18:18 -0600)
src/acl/Gadgets.cc
src/auth/AclMaxUserIp.cc
src/client_db.cc
src/eui/Eui64.cc
src/format/Token.cc
src/http/StatusCode.cc
src/main.cc
src/ssl/Config.cc
src/tests/stub_libsslsquid.cc

index c35867532cb30fe6c7fc5ee1333eae323e3357c5..1764be7f578a5e1f196aac4e91b76026677a9436 100644 (file)
@@ -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
index cd4ec1f3ecf473f7671848bd3fa41832099fa17c..381cd3a3a3999dc28fed6d029e9aed8c8327be3d 100644 (file)
@@ -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()
index c24fff51d616085ab222b05cfc590503dbe05dee..9e1132c6db0ae9ed71136ca444b2118d652c0fe3 100644 (file)
@@ -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);
 
index 1c98299e37981348fe51bde4bd7e64852128b952..385529d4ce5b210ea03578f665b07c8c30793348 100644 (file)
@@ -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);
index 6f67b144e7782e34490d17864c8d354c7ca644d8..96d3218effaf90ec6c289085267e2baa667b4e80 100644 (file)
@@ -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.
index 4afbcc7e070a6967b8b8080026fb6a2c160c23ec..854492ba4bed5c8967b7168b39111ad0de0b80e2 100644 (file)
@@ -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.
index 462eb73b72e6d700c437fe7255c98cf5358b3ded..59825577c64cfa8271e6add7fc20051751bc407d 100644 (file)
@@ -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
index f730e03c82eeda8f7f81948a8aa20b2db0667a3a..32dd1f3ecdf8c9698bba7a6f1f1c687766e0a789 100644 (file)
@@ -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;
 }
 
index 3ab73aa33a4219e7daaa40eeac0edbbaaefb045f..d1eb5f83f12d1a0bd92437f45384aa2d1c4c7b4c 100644 (file)
@@ -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