From: squidadm <squidadm@users.noreply.github.com>
Date: Mon, 9 Jul 2018 09:15:57 +0000 (+0000)
Subject: Source Format Enforcement (#244)
X-Git-Tag: M-staged-PR223~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e69ca1f15c244a68e6d58e86abbbe77bf578d2b0;p=thirdparty%2Fsquid.git

Source Format Enforcement (#244)
---

diff --git a/src/SquidConfig.h b/src/SquidConfig.h
index 4ae4661054..d99dd62941 100644
--- a/src/SquidConfig.h
+++ b/src/SquidConfig.h
@@ -28,8 +28,8 @@
 #if USE_OPENSSL
 #include "ssl/support.h"
 #endif
-#include "store/forward.h"
 #include "store/Disk.h"
+#include "store/forward.h"
 
 #if USE_OPENSSL
 class sslproxy_cert_sign;
diff --git a/src/anyp/Uri.cc b/src/anyp/Uri.cc
index 30af7eedaf..f2c2b222a0 100644
--- a/src/anyp/Uri.cc
+++ b/src/anyp/Uri.cc
@@ -445,11 +445,11 @@ AnyP::Uri::parse(const HttpRequestMethod& method, const char *url)
 /// Update the URL object with parsed URI data.
 void
 AnyP::Uri::parseFinish(const AnyP::ProtocolType protocol,
-                 const char *const protoStr, // for unknown protocols
-                 const char *const aUrlPath,
-                 const char *const aHost,
-                 const SBuf &aLogin,
-                 const int aPort)
+                       const char *const protoStr, // for unknown protocols
+                       const char *const aUrlPath,
+                       const char *const aHost,
+                       const SBuf &aLogin,
+                       const int aPort)
 {
     setScheme(protocol, protoStr);
     path(aUrlPath);
diff --git a/src/clients/FtpGateway.cc b/src/clients/FtpGateway.cc
index 65f5bfaf60..d58d926750 100644
--- a/src/clients/FtpGateway.cc
+++ b/src/clients/FtpGateway.cc
@@ -868,12 +868,12 @@ Ftp::Gateway::htmlifyListEntry(const char *line, PackableStream &html)
 
     /* construct the table row from parts. */
     html << "<tr class=\"entry\">"
-            "<td class=\"icon\"><a href=\"" << href << "\">" << icon << "</a></td>"
-            "<td class=\"filename\"><a href=\"" << href << "\">" << html_quote(text.c_str()) << "</a></td>"
-            "<td class=\"date\">" << parts->date << "</td>"
-            "<td class=\"size\">" << size << "</td>"
-            "<td class=\"actions\">" << chdir << view << download << link << "</td>"
-            "</tr>\n";
+         "<td class=\"icon\"><a href=\"" << href << "\">" << icon << "</a></td>"
+         "<td class=\"filename\"><a href=\"" << href << "\">" << html_quote(text.c_str()) << "</a></td>"
+         "<td class=\"date\">" << parts->date << "</td>"
+         "<td class=\"size\">" << size << "</td>"
+         "<td class=\"actions\">" << chdir << view << download << link << "</td>"
+         "</tr>\n";
 
     ftpListPartsFree(&parts);
     return true;
diff --git a/src/esi/Esi.cc b/src/esi/Esi.cc
index 195327063f..cba2ed979f 100644
--- a/src/esi/Esi.cc
+++ b/src/esi/Esi.cc
@@ -1985,7 +1985,6 @@ FinishAllElements(Esi::Elements &elements)
         FinishAnElement(element, pos++);
 }
 
-
 void
 esiChoose::finish()
 {
diff --git a/src/snmp/Session.cc b/src/snmp/Session.cc
index 2690989bee..79c95914a1 100644
--- a/src/snmp/Session.cc
+++ b/src/snmp/Session.cc
@@ -14,7 +14,6 @@
 #include "snmp/Session.h"
 #include "tools.h"
 
-
 Snmp::Session::Session()
 {
     memset(static_cast<snmp_session *>(this), 0, sizeof(snmp_session));