From: Source Maintenance <squidadm@squid-cache.org>
Date: Thu, 26 Feb 2015 12:12:11 +0000 (+0000)
Subject: SourceFormat Enforcement
X-Git-Tag: merge-candidate-3-v1~241
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=be75380c1b01fdfdf8f5fcad050f3a8b8318087c;p=thirdparty%2Fsquid.git

SourceFormat Enforcement
---

diff --git a/src/security/Context.h b/src/security/Context.h
index 8aef5a7878..36a6163429 100644
--- a/src/security/Context.h
+++ b/src/security/Context.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2014 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2015 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.
@@ -27,3 +27,4 @@ typedef void* ContextPointer;
 } // namespace Security
 
 #endif /* SQUID_SRC_SECURITY_CONTEXT_H */
+
diff --git a/src/security/Makefile.am b/src/security/Makefile.am
index 6876db9c00..9292a5a5fd 100644
--- a/src/security/Makefile.am
+++ b/src/security/Makefile.am
@@ -1,4 +1,4 @@
-## Copyright (C) 1996-2014 The Squid Software Foundation and contributors
+## Copyright (C) 1996-2015 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/security/PeerOptions.cc b/src/security/PeerOptions.cc
index 678cc1cfd1..bc60a20138 100644
--- a/src/security/PeerOptions.cc
+++ b/src/security/PeerOptions.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2014 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2015 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.
@@ -65,7 +65,7 @@ Security::PeerOptions::createContext(bool setOptions)
 #if USE_OPENSSL
     // XXX: temporary performance regression. c_str() data copies and prevents this being a const method
     t = sslCreateClientContext(certFile.c_str(), privateKeyFile.c_str(), sslVersion, sslCipher.c_str(),
-                           (setOptions ? sslOptions.c_str() : NULL), sslFlags.c_str(), caFile.c_str(), caDir.c_str(), crlFile.c_str());
+                               (setOptions ? sslOptions.c_str() : NULL), sslFlags.c_str(), caFile.c_str(), caDir.c_str(), crlFile.c_str());
 #endif
 
     return t;
diff --git a/src/security/PeerOptions.h b/src/security/PeerOptions.h
index 8ba7bbcca0..6e206ff623 100644
--- a/src/security/PeerOptions.h
+++ b/src/security/PeerOptions.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2014 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2015 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.
@@ -61,3 +61,4 @@ void parse_securePeerOptions(Security::PeerOptions *);
 #define dump_securePeerOptions(e,n,x) // not supported yet
 
 #endif /* SQUID_SRC_SECURITY_PEEROPTIONS_H */
+
diff --git a/src/tests/Stub.list b/src/tests/Stub.list
index 0a909dc2e9..72413414f7 100644
--- a/src/tests/Stub.list
+++ b/src/tests/Stub.list
@@ -49,6 +49,7 @@ STUB_SOURCE= tests/STUB.h \
 	tests/stub_libicmp.cc \
 	tests/stub_libmem.cc \
 	tests/stub_libmgr.cc \
+	tests/stub_libsecurity.cc \
 	tests/stub_libsslsquid.cc \
 	tests/stub_main_cc.cc \
 	tests/stub_MemBuf.cc \
diff --git a/src/tests/stub_libsecurity.cc b/src/tests/stub_libsecurity.cc
index 2bbb1cd1f3..4f70cf8cf0 100644
--- a/src/tests/stub_libsecurity.cc
+++ b/src/tests/stub_libsecurity.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2014 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2015 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.
@@ -16,3 +16,4 @@ Security::PeerOptions Security::ProxyOutgoingConfig;
 void Security::PeerOptions::parse(char const*) STUB
 Security::ContextPointer Security::PeerOptions::createContext(bool) STUB_RETVAL(NULL)
 void parse_securePeerOptions(Security::PeerOptions *) STUB
+
diff --git a/src/tunnel.cc b/src/tunnel.cc
index c0ddbb6eec..485de198ff 100644
--- a/src/tunnel.cc
+++ b/src/tunnel.cc
@@ -117,7 +117,7 @@ public:
 
     public:
         Connection() : len (0), buf ((char *)xmalloc(SQUID_TCP_SO_RCVBUF)), size_ptr(NULL), delayedLoops(0),
-                       readPending(NULL), readPendingFunc(NULL) {}
+            readPending(NULL), readPendingFunc(NULL) {}
 
         ~Connection();