Source Format Enforcement (#1046)

diff --git a/src/HttpHeader.cc b/src/HttpHeader.cc
index 1a69b6b2ab1115d3d5859a31016a75518432a332..6f6de328946264209b8c00e1eb518994a20389cf 100644 (file)
--- 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 a6d5bd7e5d1706e0e4e9f13bbdbfa01205363dc6..d6e9c5f7268e1adb84c27191ba3a8f9afd40a7f9 100644 (file)
--- 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 42af64ce74735fe6168a68197d01cb3059c9168d..ff2ac84b846771691d773b0e45b1ee749f4b0218 100644 (file)
--- 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 ba9ea726585b7000fd9f81a81084f3ae9a9a5cc5..e07362b8eb50474c05bc99fbea46c877686e7f6d 100644 (file)
--- 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 2e16cd96ed4db491fd19fe6313265b9389ae43a8..6e931afa922ed28f4e67a40cc11595e11e5b2710 100644 (file)
--- 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 190b02ededc212866452035c5cf36fa97b8463d2..179cd5ed740eeb93c83570c2b80e7d831377dcc5 100644 (file)
--- 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 e5e5a76c4dd0f13a8182a87d5f2774c2e1851f81..6883dc5454ac7681038d97a8e3f920f18ebc6974 100644 (file)
--- 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.