From: squidadm <squidadm@users.noreply.github.com>
Date: Fri, 20 May 2022 23:00:16 +0000 (+0000)
Subject: Source Format Enforcement (#1046)
X-Git-Tag: SQUID_6_0_1~180
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7c6a034c9ad1ebc3d9c157ec65059762c4fc636b;p=thirdparty%2Fsquid.git

Source Format Enforcement (#1046)
---

diff --git a/src/HttpHeader.cc b/src/HttpHeader.cc
index 1a69b6b2ab..6f6de32894 100644
--- a/src/HttpHeader.cc
+++ b/src/HttpHeader.cc
@@ -30,8 +30,8 @@
 #include "StatHist.h"
 #include "Store.h"
 #include "StrList.h"
-#include "TimeOrTag.h"
 #include "time/gadgets.h"
+#include "TimeOrTag.h"
 #include "util.h"
 
 #include <algorithm>
diff --git a/src/Makefile.am b/src/Makefile.am
index a6d5bd7e5d..d6e9c5f726 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -784,9 +784,9 @@ tests_testBoilerplate_LDFLAGS = $(LIBADD_DL)
 ## Tests of SquidMath.h
 check_PROGRAMS += tests/testMath
 tests_testMath_SOURCES = \
-	 tests/testMath.cc
+	tests/testMath.cc
 nodist_tests_testMath_SOURCES = \
-	 SquidMath.h
+	SquidMath.h
 tests_testMath_LDADD = \
 	$(LIBCPPUNIT_LIBS) \
 	$(COMPAT_LIB) \
diff --git a/src/base/AsyncFunCalls.h b/src/base/AsyncFunCalls.h
index 42af64ce74..ff2ac84b84 100644
--- a/src/base/AsyncFunCalls.h
+++ b/src/base/AsyncFunCalls.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 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/debug/Makefile.am b/src/debug/Makefile.am
index ba9ea72658..e07362b8eb 100644
--- a/src/debug/Makefile.am
+++ b/src/debug/Makefile.am
@@ -11,7 +11,7 @@ include $(top_srcdir)/src/TestHeaders.am
 noinst_LTLIBRARIES = libdebug.la
 
 libdebug_la_SOURCES = \
-	debug.cc \
 	Messages.h \
-	Stream.h
+	Stream.h \
+	debug.cc
 
diff --git a/src/gopher.cc b/src/gopher.cc
index 2e16cd96ed..6e931afa92 100644
--- a/src/gopher.cc
+++ b/src/gopher.cc
@@ -577,12 +577,12 @@ gopherToHTML(GopherStateData * gopherState, char *inbuf, int len)
                     if ((gtype == GOPHER_TELNET) || (gtype == GOPHER_3270)) {
                         if (strlen(escaped_selector) != 0)
                             outbuf.appendf("<IMG border=\"0\" SRC=\"%s\"> <A HREF=\"telnet://%s@%s%s%s/\">%s</A>\n",
-                                     icon_url, escaped_selector, rfc1738_escape_part(host),
-                                     *port ? ":" : "", port, html_quote(name));
+                                           icon_url, escaped_selector, rfc1738_escape_part(host),
+                                           *port ? ":" : "", port, html_quote(name));
                         else
                             outbuf.appendf("<IMG border=\"0\" SRC=\"%s\"> <A HREF=\"telnet://%s%s%s/\">%s</A>\n",
-                                     icon_url, rfc1738_escape_part(host), *port ? ":" : "",
-                                     port, html_quote(name));
+                                           icon_url, rfc1738_escape_part(host), *port ? ":" : "",
+                                           port, html_quote(name));
 
                     } else if (gtype == GOPHER_INFO) {
                         outbuf.appendf("\t%s\n", html_quote(name));
@@ -590,14 +590,14 @@ gopherToHTML(GopherStateData * gopherState, char *inbuf, int len)
                         if (strncmp(selector, "GET /", 5) == 0) {
                             /* WWW link */
                             outbuf.appendf("<IMG border=\"0\" SRC=\"%s\"> <A HREF=\"http://%s/%s\">%s</A>\n",
-                                     icon_url, host, rfc1738_escape_unescaped(selector + 5), html_quote(name));
+                                           icon_url, host, rfc1738_escape_unescaped(selector + 5), html_quote(name));
                         } else if (gtype == GOPHER_WWW) {
                             outbuf.appendf("<IMG border=\"0\" SRC=\"%s\"> <A HREF=\"gopher://%s/%c%s\">%s</A>\n",
-                                     icon_url, rfc1738_escape_unescaped(selector), html_quote(name));
+                                           icon_url, rfc1738_escape_unescaped(selector), html_quote(name));
                         } else {
                             /* Standard link */
                             outbuf.appendf("<IMG border=\"0\" SRC=\"%s\"> <A HREF=\"gopher://%s/%c%s\">%s</A>\n",
-                                     icon_url, host, gtype, escaped_selector, html_quote(name));
+                                           icon_url, host, gtype, escaped_selector, html_quote(name));
                         }
                     }
 
diff --git a/src/mem/Sensitive.h b/src/mem/Sensitive.h
index 190b02eded..179cd5ed74 100644
--- a/src/mem/Sensitive.h
+++ b/src/mem/Sensitive.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 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/tests/testMath.cc b/src/tests/testMath.cc
index e5e5a76c4d..6883dc5454 100644
--- a/src/tests/testMath.cc
+++ b/src/tests/testMath.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.