From: Automatic source maintenance <squidadm@squid-cache.org>
Date: Thu, 28 Aug 2014 00:14:08 +0000 (-0600)
Subject: SourceFormat Enforcement
X-Git-Tag: SQUID_3_5_0_1~87
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=40f1e76d80623030fb6de35075102f50cc011db6;p=thirdparty%2Fsquid.git

SourceFormat Enforcement
---

diff --git a/src/acl/AtStep.cc b/src/acl/AtStep.cc
index 0e5ebff836..b59397464c 100644
--- a/src/acl/AtStep.cc
+++ b/src/acl/AtStep.cc
@@ -2,9 +2,9 @@
 
 #if USE_OPENSSL
 
-#include "acl/Checklist.h"
 #include "acl/AtStep.h"
 #include "acl/AtStepData.h"
+#include "acl/Checklist.h"
 #include "client_side.h"
 #include "ssl/ServerBump.h"
 
diff --git a/src/acl/AtStepData.cc b/src/acl/AtStepData.cc
index e052eb8ca3..3e0ac87481 100644
--- a/src/acl/AtStepData.cc
+++ b/src/acl/AtStepData.cc
@@ -2,8 +2,8 @@
 
 #if USE_OPENSSL
 
-#include "acl/Checklist.h"
 #include "acl/AtStepData.h"
+#include "acl/Checklist.h"
 #include "cache_cf.h"
 #include "Debug.h"
 #include "wordlist.h"
diff --git a/src/ssl/bio.cc b/src/ssl/bio.cc
index 86d6b882da..5270e73a6a 100644
--- a/src/ssl/bio.cc
+++ b/src/ssl/bio.cc
@@ -10,9 +10,9 @@
 #if USE_OPENSSL
 
 #include "comm.h"
-#include "ip/Address.h"
 #include "fde.h"
 #include "globals.h"
+#include "ip/Address.h"
 #include "Mem.h"
 #include "ssl/bio.h"
 
@@ -70,7 +70,6 @@ Ssl::Bio::Link(SSL *ssl, BIO *bio)
     SSL_set_info_callback(ssl, &squid_ssl_info); // does not provide diagnostic
 }
 
-
 Ssl::Bio::Bio(const int anFd): fd_(anFd)
 {
     debugs(83, 7, "Bio constructed, this=" << this << " FD " << fd_);
@@ -303,7 +302,6 @@ Ssl::ServerBio::read(char *buf, int size, BIO *table)
     return bytes;
 }
 
-
 // This function makes the required checks to examine if the client hello
 // message is compatible with the features provided by OpenSSL toolkit.
 // If the features are compatible and can be supported it tries to rewrite SSL
@@ -923,7 +921,7 @@ Ssl::Bio::sslFeatures::print(std::ostream &os) const
 {
     static std::string buf;
     return os << "v" << sslVersion <<
-        " SNI:" << (serverName.isEmpty() ? SBuf("-") : serverName) <<
+           " SNI:" << (serverName.isEmpty() ? SBuf("-") : serverName) <<
            " comp:" << compressMethod <<
            " Ciphers:" << clientRequestedCiphers <<
            " Random:" << objToString(client_random, SSL3_RANDOM_SIZE) <<
diff --git a/src/ssl/support.cc b/src/ssl/support.cc
index 2e26a2c921..a9a2179233 100644
--- a/src/ssl/support.cc
+++ b/src/ssl/support.cc
@@ -1023,7 +1023,6 @@ int Ssl::OpenSSLtoSquidSSLVersion(int sslVersion)
         return 1;
 }
 
-
 #if OPENSSL_VERSION_NUMBER < 0x00909000L
 SSL_METHOD *
 #else
diff --git a/src/ssl/support.h b/src/ssl/support.h
index 2cfb469f01..dfbf20b47c 100644
--- a/src/ssl/support.h
+++ b/src/ssl/support.h
@@ -255,7 +255,6 @@ bool configureSSL(SSL *ssl, CertificateProperties const &properties, AnyP::PortC
  */
 bool configureSSLUsingPkeyAndCertFromMemory(SSL *ssl, const char *data, AnyP::PortCfg &port);
 
-
 /**
   \ingroup ServerProtocolSSLAPI
   * Adds the certificates in certList to the certificate chain of the SSL context
diff --git a/src/tunnel.cc b/src/tunnel.cc
index e89f35f66f..020749c713 100644
--- a/src/tunnel.cc
+++ b/src/tunnel.cc
@@ -44,8 +44,8 @@
 #include "comm/Write.h"
 #include "errorpage.h"
 #include "fde.h"
-#include "globals.h"
 #include "FwdState.h"
+#include "globals.h"
 #include "http.h"
 #include "HttpRequest.h"
 #include "HttpStateFlags.h"
@@ -1140,7 +1140,6 @@ switchToTunnel(HttpRequest *request, int *status_ptr, Comm::ConnectionPointer &c
         }
     }
 
-
     comm_add_close_handler(tunnelState->client.conn->fd,
                            tunnelClientClosed,
                            tunnelState);