Source Format Enforcement (#845)

diff --git a/src/Makefile.am b/src/Makefile.am
index 63f1b3fa306d058525fe9d26b6ab08cf11eb49b3..6033555cf918457c95bf0822005c8f70f13e967f 100644 (file)
--- 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 d34826ed3a8afc31670cd68821d139dc1e1620a2..7449c9e77aed4a1e3b0152e8148e380f252d1583 100644 (file)
--- 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 ddaef05ec7a399c96eb14a00f26dccb10b237dc0..ef4baff8c9b3fafd54cb87240a03c5fa18708613 100644 (file)
--- 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 822770d41a287db7649cbc258e638563746d58d0..ebb917e5af18c6f77ff675b1b187a3a9452c831f 100644 (file)
--- 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 1637d6f1485612bb29da00e40138311fce6a6050..5f75db3f7e5d96acbab356b1adb39451dd6d7dd8 100644 (file)
--- 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 <ostream>
 

diff --git a/src/security/CommunicationSecrets.h b/src/security/CommunicationSecrets.h
index f79e3ff97d1b86a91d6464577a32eb3d4e8cd8aa..c21b1e32439318b1d4efb4cc496908584a9a5fbf 100644 (file)
--- 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 e5027f240f3662677c348ded33e57dca5f2a694d..bf165c7fcdea771661ce6a635befced23b83ec9b 100644 (file)
--- 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 4393e36f18badd59cfdf60c98b0869358c626e82..95afe2f91fc838615603cae23fb7f9e62af23c08 100644 (file)
--- 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 5eb97582c15d9e0bf5ef478afd9cd4c8a8eac5ac..623623b9e8f6fa5b438a268f804e34c2c5895f66 100644 (file)
--- 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 0df795ee85ad486790911f5888c553df974cb498..30afed948051102e4fe4a9b4bdd00e3006402429 100644 (file)
--- 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 4a62fd6e25e32d237c5fa67ed1f0d270a8bc6467..0c4662dd89ef1475bc5f78d590e4959221aac828 100644 (file)
--- 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 <memory>