From: Source Maintenance <squidadm@squid-cache.org>
Date: Fri, 10 Apr 2015 12:12:08 +0000 (+0000)
Subject: SourceFormat Enforcement
X-Git-Tag: merge-candidate-3-v1~184
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8823b1c98ad400a7ed10f07f9ee7e8e6a9967b31;p=thirdparty%2Fsquid.git

SourceFormat Enforcement
---

diff --git a/src/acl/ServerName.cc b/src/acl/ServerName.cc
index 31a85c1c14..27884e9c28 100644
--- a/src/acl/ServerName.cc
+++ b/src/acl/ServerName.cc
@@ -10,9 +10,9 @@
 
 #include "squid.h"
 #include "acl/Checklist.h"
-#include "acl/ServerName.h"
 #include "acl/DomainData.h"
 #include "acl/RegexData.h"
+#include "acl/ServerName.h"
 #include "client_side.h"
 #include "fde.h"
 #include "HttpRequest.h"
@@ -70,7 +70,7 @@ check_cert_domain( void *check_data, ASN1_STRING *cn_data)
 
     if (cn_data->length > (int)sizeof(cn) - 1)
         return 1; // ignore data that does not fit our buffer
- 
+
     memcpy(cn, cn_data->data, cn_data->length);
     cn[cn_data->length] = '\0';
     debugs(28, 4, "Verifying certificate name/subjectAltName " << cn);
diff --git a/src/acl/ServerName.h b/src/acl/ServerName.h
index 9ba3fba73b..fd89250ed4 100644
--- a/src/acl/ServerName.h
+++ b/src/acl/ServerName.h
@@ -12,13 +12,13 @@
 #include "acl/Acl.h"
 #include "acl/Checklist.h"
 #include "acl/Data.h"
-#include "acl/Strategised.h"
 #include "acl/DomainData.h"
+#include "acl/Strategised.h"
 
 class ACLServerNameData : public ACLDomainData {
     MEMPROXY_CLASS(ACLServerNameData);
 public:
-    ACLServerNameData() : ACLDomainData(){}
+    ACLServerNameData() : ACLDomainData() {}
     virtual bool match(const char *);
     virtual ACLData<char const *> *clone() const;
 };
diff --git a/src/ssl/PeerConnector.cc b/src/ssl/PeerConnector.cc
index 5348432c7a..e690e366d1 100644
--- a/src/ssl/PeerConnector.cc
+++ b/src/ssl/PeerConnector.cc
@@ -281,7 +281,7 @@ Ssl::PeerConnector::handleServerCertificate()
 
         // remember the server certificate for later use
         if (Ssl::ServerBump *serverBump = csd->serverBump()) {
-            serverBump->serverCert.reset(serverCert.release());   
+            serverBump->serverCert.reset(serverCert.release());
         }
     }
 }