From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 19 Aug 2016 06:55:38 +0000 (+1200)
Subject: Cleanup: remove needless LockingPointer::resetWithoutLocking(nullptr)
X-Git-Tag: SQUID_4_0_14~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1ca8bbfb1ca81a3ed4a13a2b608437e0768aaec5;p=thirdparty%2Fsquid.git

Cleanup: remove needless LockingPointer::resetWithoutLocking(nullptr)
---

diff --git a/src/comm.cc b/src/comm.cc
index e606224740..0edaea2ff1 100644
--- a/src/comm.cc
+++ b/src/comm.cc
@@ -838,7 +838,7 @@ void
 comm_close_complete(const FdeCbParams &params)
 {
     fde *F = &fd_table[params.fd];
-    F->ssl.resetWithoutLocking(nullptr);
+    F->ssl.reset();
 
 #if USE_OPENSSL
     if (F->dynamicSslContext) {
diff --git a/src/fde.h b/src/fde.h
index 4978b5e377..938e3b79b9 100644
--- a/src/fde.h
+++ b/src/fde.h
@@ -167,7 +167,7 @@ public:
         halfClosedReader = NULL;
         read_method = NULL;
         write_method = NULL;
-        ssl.resetWithoutLocking(nullptr);
+        ssl.reset();
         dynamicSslContext = NULL;
 #if _SQUID_WINDOWS_
         win32.handle = (long)NULL;
diff --git a/src/security/cert_generators/file/security_file_certgen.cc b/src/security/cert_generators/file/security_file_certgen.cc
index 63e96c889d..2b4bbd6452 100644
--- a/src/security/cert_generators/file/security_file_certgen.cc
+++ b/src/security/cert_generators/file/security_file_certgen.cc
@@ -204,8 +204,8 @@ static bool processNewRequest(Ssl::CrtdMessage & request_message, std::string co
         if (!Ssl::certificateMatchesProperties(cert.get(), certProperties)) {
             // The certificate changed (renewed or other reason).
             // Generete a new one with the updated fields.
-            cert.resetWithoutLocking(nullptr);
-            pkey.resetWithoutLocking(nullptr);
+            cert.reset();
+            pkey.reset();
             db.purgeCert(cert_subject);
         }
     }