Source Format Enforcement (#467)

diff --git a/src/FwdState.cc b/src/FwdState.cc
index f68303c07738d9be08e3288ba7b339525a65bb3f..bd4d9440d3ea07e34e49fe647fdcd18a05fde1d4 100644 (file)
--- a/src/FwdState.cc
+++ b/src/FwdState.cc
@@ -566,9 +566,9 @@ FwdState::noteDestination(Comm::ConnectionPointer path)
     // recognize step1 bumping by nil ConnStateData::serverBump().
 #if USE_OPENSSL
     const auto clientFirstBump = request->clientConnectionManager.valid() &&
-        (request->clientConnectionManager->sslBumpMode == Ssl::bumpClientFirst ||
-         (request->clientConnectionManager->sslBumpMode == Ssl::bumpBump && !request->clientConnectionManager->serverBump())
-            );
+                                 (request->clientConnectionManager->sslBumpMode == Ssl::bumpClientFirst ||
+                                  (request->clientConnectionManager->sslBumpMode == Ssl::bumpBump && !request->clientConnectionManager->serverBump())
+                                 );
 #else
     const auto clientFirstBump = false;
 #endif /* USE_OPENSSL */

diff --git a/src/FwdState.h b/src/FwdState.h
index 3eb101edb851acfc52a0524fd113449d63aacd81..cda66ff57c7a472264458082710e5945a75a7f87 100644 (file)
--- a/src/FwdState.h
+++ b/src/FwdState.h
@@ -10,8 +10,8 @@
 #define SQUID_FORWARD_H
 
 #include "base/CbcPointer.h"
-#include "base/RefCount.h"
 #include "base/forward.h"
+#include "base/RefCount.h"
 #include "clients/forward.h"
 #include "comm.h"
 #include "comm/Connection.h"

diff --git a/src/HappyConnOpener.cc b/src/HappyConnOpener.cc
index 601b7bb885b7898b3f85c2cd1f296439049b8ff7..bf40ceb55430b602fed160f439b73f3d09d3a59e 100644 (file)
--- a/src/HappyConnOpener.cc
+++ b/src/HappyConnOpener.cc
@@ -9,8 +9,8 @@
 #include "squid.h"
 #include "AccessLogEntry.h"
 #include "CachePeer.h"
-#include "FwdState.h"
 #include "errorpage.h"
+#include "FwdState.h"
 #include "HappyConnOpener.h"
 #include "HttpRequest.h"
 #include "ip/QosConfig.h"

diff --git a/src/acl/Checklist.cc b/src/acl/Checklist.cc
index 8a5775593f8c11dba1fcb4c6aa741e2353113b13..fb07b54964eb259f3bb510a36f8f5f58fbf0a72e 100644 (file)
--- a/src/acl/Checklist.cc
+++ b/src/acl/Checklist.cc
@@ -371,7 +371,7 @@ void
 ACLChecklist::calcImplicitAnswer()
 {
     const auto lastAction = (accessList && cbdataReferenceValid(accessList)) ?
-                               accessList->lastAction() : Acl::Answer(ACCESS_DUNNO);
+                            accessList->lastAction() : Acl::Answer(ACCESS_DUNNO);
     auto implicitRuleAnswer = Acl::Answer(ACCESS_DUNNO);
     if (lastAction == ACCESS_DENIED) // reverse last seen "deny"
         implicitRuleAnswer = Acl::Answer(ACCESS_ALLOWED);

diff --git a/src/client_side.cc b/src/client_side.cc
index f053ede238312e52cabc0dab2fda76933bb32d26..693a7d95080a2a1b60becffaebd3daee9ed98f5e 100644 (file)
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -1297,7 +1297,7 @@ ConnStateData::parseHttpRequest(const Http1::RequestParserPointer &hp)
                 hp->parseStatusCode == Http::scRequestHeaderFieldsTooLarge ||
                 hp->parseStatusCode == Http::scUriTooLong;
             auto result = abortRequestParsing(
-                          tooBig ? "error:request-too-large" : "error:invalid-request");
+                              tooBig ? "error:request-too-large" : "error:invalid-request");
             // assume that remaining leftovers belong to this bad request
             if (!inBuf.isEmpty())
                 consumeInput(inBuf.length());

diff --git a/src/client_side.h b/src/client_side.h
index e1e760971adc538dadc5904bc7f76c25c78616c5..73fd59690317dec06c548c861cbc1e6fa4a04a51 100644 (file)
--- a/src/client_side.h
+++ b/src/client_side.h
@@ -351,7 +351,6 @@ protected:
     /// TODO: Move to HttpServer. Warning: Move requires large code nonchanges!
     Http::Stream *parseHttpRequest(const Http1::RequestParserPointer &);
 
-
     /// parse input buffer prefix into a single transfer protocol request
     /// return NULL to request more header bytes (after checking any limits)
     /// use abortRequestParsing() to handle parsing errors w/o creating request

diff --git a/src/helper/ReservationId.cc b/src/helper/ReservationId.cc
index 11d48f4c16e6fb7890884aed05d3bd6ff1b47695..f1e74e596433969269260a660b17040c694bba3a 100644 (file)
--- a/src/helper/ReservationId.cc
+++ b/src/helper/ReservationId.cc
@@ -1,3 +1,12 @@
+/*
+ * Copyright (C) 1996-2019 The Squid Software Foundation and contributors
+ *
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
+ */
+
+#include "squid.h"
 #include "helper/ReservationId.h"
 
 Helper::ReservationId

diff --git a/src/helper/ReservationId.h b/src/helper/ReservationId.h
index bab60a2568192ef1c6eb23a6065cf200e746b5b4..f9dafc6f1be01cb99b717b518c15ff9d43943580 100644 (file)
--- a/src/helper/ReservationId.h
+++ b/src/helper/ReservationId.h
@@ -1,4 +1,3 @@
-
 /*
  * Copyright (C) 1996-2019 The Squid Software Foundation and contributors
  *

diff --git a/src/tests/testRefCount.cc b/src/tests/testRefCount.cc
index e7474c6adadb5185a41160c990395e9eaa3cc600..7372dbcbf46a409df911076d8d8d8ffd1d684d8e 100644 (file)
--- a/src/tests/testRefCount.cc
+++ b/src/tests/testRefCount.cc
@@ -171,3 +171,4 @@ testRefCount::testDoubleInheritToSingleInherit()
     }
     CPPUNIT_ASSERT_EQUAL(1, _ToRefCount::Instances);
 }
+

diff --git a/src/tests/testRefCount.h b/src/tests/testRefCount.h
index 8c74cb133fd5c929e156affbead6517d2b5ad51b..d371f9b8928d464c099cc70131d4704a9dd62255 100644 (file)
--- a/src/tests/testRefCount.h
+++ b/src/tests/testRefCount.h
@@ -36,3 +36,4 @@ protected:
 };
 
 #endif
+