From a70e75b76a4e4c763abc64574d18e1859e54631f Mon Sep 17 00:00:00 2001 From: squidadm Date: Sat, 7 Sep 2019 01:43:07 +0000 Subject: [PATCH] Source Format Enforcement (#467) --- src/FwdState.cc | 6 +++--- src/FwdState.h | 2 +- src/HappyConnOpener.cc | 2 +- src/acl/Checklist.cc | 2 +- src/client_side.cc | 2 +- src/client_side.h | 1 - src/helper/ReservationId.cc | 9 +++++++++ src/helper/ReservationId.h | 1 - src/tests/testRefCount.cc | 1 + src/tests/testRefCount.h | 1 + 10 files changed, 18 insertions(+), 9 deletions(-) diff --git a/src/FwdState.cc b/src/FwdState.cc index f68303c077..bd4d9440d3 100644 --- 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 3eb101edb8..cda66ff57c 100644 --- 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 601b7bb885..bf40ceb554 100644 --- 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 8a5775593f..fb07b54964 100644 --- 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 f053ede238..693a7d9508 100644 --- 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 e1e760971a..73fd596903 100644 --- 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 11d48f4c16..f1e74e5964 100644 --- 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 bab60a2568..f9dafc6f1b 100644 --- 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 e7474c6ada..7372dbcbf4 100644 --- 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 8c74cb133f..d371f9b892 100644 --- a/src/tests/testRefCount.h +++ b/src/tests/testRefCount.h @@ -36,3 +36,4 @@ protected: }; #endif + -- 2.47.2