SourceFormat Enforcement

diff --git a/src/security/Context.h b/src/security/Context.h
index 8aef5a7878c3bee1b41121476c0e51a6889d2863..36a6163429a4c331495811a1f691777027f076ce 100644 (file)
--- 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 6876db9c0051efb8cb592e0b67ee2ec3dd95549b..9292a5a5fda5d8ce5310a2be2bbb03e17ae2b522 100644 (file)
--- 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 678cc1cfd18d2b1c766d81094bc04b8811c76cd7..bc60a20138e93905a7cb57745d2f5c1f44e98b8c 100644 (file)
--- 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 8ba7bbcca0533634be0b24c009eea924a1be121d..6e206ff623ac06e2e5a56f33ac9a4db33ca84201 100644 (file)
--- 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 0a909dc2e9223d37b4b5d36d3a80d6a915959aa2..72413414f776312dd8c530e8f641eac36609d99e 100644 (file)
--- 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 2bbb1cd1f346f3f61bb687d3908d7643970b1f82..4f70cf8cf0218b0bf3181aedae69798cc5681cda 100644 (file)
--- 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 c0ddbb6eeccae15d478639eb04700276ecfe9f45..485de198ff47ee947c9cf5b9c44eaa318c9f2e5a 100644 (file)
--- 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();