From: Source Maintenance <squidadm@squid-cache.org>
Date: Sun, 11 Oct 2015 18:12:00 +0000 (+0000)
Subject: SourceFormat Enforcement
X-Git-Tag: SQUID_4_0_1~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3736fdd638492b925d601eb0e22a25a7d470f8be;p=thirdparty%2Fsquid.git

SourceFormat Enforcement
---

diff --git a/src/format/Format.cc b/src/format/Format.cc
index 1bf619dfe7..44b1e878f6 100644
--- a/src/format/Format.cc
+++ b/src/format/Format.cc
@@ -1020,13 +1020,13 @@ Format::Format::assemble(MemBuf &mb, const AccessLogEntry::Pointer &al, int logS
             break;
 
         case LFT_REQUEST_METHOD:
-            {
-                const SBuf s(al->getLogMethod());
-                sb.append(s.rawContent(), s.length());
-                out = sb.termedBuf();
-                quote = 1;
-            }
-            break;
+        {
+            const SBuf s(al->getLogMethod());
+            sb.append(s.rawContent(), s.length());
+            out = sb.termedBuf();
+            quote = 1;
+        }
+        break;
 
         case LFT_REQUEST_URI:
             out = al->url;
@@ -1168,7 +1168,7 @@ Format::Format::assemble(MemBuf &mb, const AccessLogEntry::Pointer &al, int logS
             // for Ssl::bumpEnd, Ssl::bumpMode() returns NULL and we log '-'
             out = Ssl::bumpMode(mode);
         }
-            break;
+        break;
 
         case LFT_EXT_ACL_USER_CERT_RAW:
             if (al->request) {
@@ -1205,7 +1205,7 @@ Format::Format::assemble(MemBuf &mb, const AccessLogEntry::Pointer &al, int logS
                 ConnStateData *conn = al->request->clientConnectionManager.get();
                 if (conn != NULL && Comm::IsConnOpen(conn->clientConnection)) {
                     if (SSL *ssl = fd_table[conn->clientConnection->fd].ssl)
-                       out = sslGetCAAttribute(ssl, format->data.header.header);
+                        out = sslGetCAAttribute(ssl, format->data.header.header);
                 }
             }
             break;
@@ -1381,7 +1381,8 @@ Format::Format::assemble(MemBuf &mb, const AccessLogEntry::Pointer &al, int logS
                     newout = mbq.content();
                     mbq.stolen = 1;
                     newfree = 1;
-                    } break;
+                }
+                break;
 
                 case LOG_QUOTE_RAW:
                     break;
diff --git a/src/security/ServerOptions.h b/src/security/ServerOptions.h
index 9c09ea21f5..e60566d63d 100644
--- a/src/security/ServerOptions.h
+++ b/src/security/ServerOptions.h
@@ -46,3 +46,4 @@ private:
 } // namespace Security
 
 #endif /* SQUID_SRC_SECURITY_SERVEROPTIONS_H */
+
diff --git a/src/tests/stub_libsecurity.cc b/src/tests/stub_libsecurity.cc
index 2dd6a4be23..72286b770f 100644
--- a/src/tests/stub_libsecurity.cc
+++ b/src/tests/stub_libsecurity.cc
@@ -33,3 +33,4 @@ void parse_securePeerOptions(Security::PeerOptions *) STUB
 void Security::ServerOptions::parse(const char *) STUB
 void Security::ServerOptions::dumpCfg(Packable *, const char *) const STUB
 void Security::ServerOptions::updateContextEecdh(Security::ContextPointer &) STUB
+