From: squidadm Date: Thu, 17 Jun 2021 18:10:24 +0000 (+0000) Subject: Source Format Enforcement (#845) X-Git-Tag: SQUID_6_0_1~320 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4106be3f9c2a38956a554f3f4ef3eb41b89f6531;p=thirdparty%2Fsquid.git Source Format Enforcement (#845) --- diff --git a/src/Makefile.am b/src/Makefile.am index 63f1b3fa30..6033555cf9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2177,9 +2177,9 @@ tests_testHttpReply_SOURCES = \ tests/stub_cache_cf.cc \ cache_cf.h \ tests/stub_cache_manager.cc \ - tests/stub_client_side.cc \ cbdata.cc \ cbdata.h \ + tests/stub_client_side.cc \ tests/stub_comm.cc \ tests/stub_debug.cc \ tests/stub_errorpage.cc \ diff --git a/src/acl/ChecklistFiller.h b/src/acl/ChecklistFiller.h index d34826ed3a..7449c9e77a 100644 --- a/src/acl/ChecklistFiller.h +++ b/src/acl/ChecklistFiller.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2020 The Squid Software Foundation and contributors + * Copyright (C) 1996-2021 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/client_side.cc b/src/client_side.cc index ddaef05ec7..ef4baff8c9 100644 --- a/src/client_side.cc +++ b/src/client_side.cc @@ -108,10 +108,10 @@ #include "proxyp/Header.h" #include "proxyp/Parser.h" #include "sbuf/Stream.h" -#include "security/Io.h" #include "security/CommunicationSecrets.h" -#include "security/NegotiationHistory.h" +#include "security/Io.h" #include "security/KeyLog.h" +#include "security/NegotiationHistory.h" #include "servers/forward.h" #include "SquidConfig.h" #include "SquidTime.h" diff --git a/src/http/Message.cc b/src/http/Message.cc index 822770d41a..ebb917e5af 100644 --- a/src/http/Message.cc +++ b/src/http/Message.cc @@ -289,3 +289,4 @@ Http::Message::firstLineBuf(MemBuf &mb) { packFirstLineInto(&mb, true); } + diff --git a/src/security/CommunicationSecrets.cc b/src/security/CommunicationSecrets.cc index 1637d6f148..5f75db3f7e 100644 --- a/src/security/CommunicationSecrets.cc +++ b/src/security/CommunicationSecrets.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2020 The Squid Software Foundation and contributors + * Copyright (C) 1996-2021 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -8,8 +8,8 @@ #include "squid.h" #include "base/CharacterSet.h" -#include "security/Session.h" #include "security/CommunicationSecrets.h" +#include "security/Session.h" #include diff --git a/src/security/CommunicationSecrets.h b/src/security/CommunicationSecrets.h index f79e3ff97d..c21b1e3243 100644 --- a/src/security/CommunicationSecrets.h +++ b/src/security/CommunicationSecrets.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2020 The Squid Software Foundation and contributors + * Copyright (C) 1996-2021 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/security/KeyLog.cc b/src/security/KeyLog.cc index e5027f240f..bf165c7fcd 100644 --- a/src/security/KeyLog.cc +++ b/src/security/KeyLog.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2020 The Squid Software Foundation and contributors + * Copyright (C) 1996-2021 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/security/KeyLog.h b/src/security/KeyLog.h index 4393e36f18..95afe2f91f 100644 --- a/src/security/KeyLog.h +++ b/src/security/KeyLog.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2020 The Squid Software Foundation and contributors + * Copyright (C) 1996-2021 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/security/KeyLogger.cc b/src/security/KeyLogger.cc index 5eb97582c1..623623b9e8 100644 --- a/src/security/KeyLogger.cc +++ b/src/security/KeyLogger.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2020 The Squid Software Foundation and contributors + * Copyright (C) 1996-2021 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/security/KeyLogger.h b/src/security/KeyLogger.h index 0df795ee85..30afed9480 100644 --- a/src/security/KeyLogger.h +++ b/src/security/KeyLogger.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2020 The Squid Software Foundation and contributors + * Copyright (C) 1996-2021 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/security/Session.h b/src/security/Session.h index 4a62fd6e25..0c4662dd89 100644 --- a/src/security/Session.h +++ b/src/security/Session.h @@ -11,8 +11,8 @@ #include "base/HardFun.h" #include "comm/forward.h" -#include "security/LockingPointer.h" #include "security/forward.h" +#include "security/LockingPointer.h" #include