From: Kurt Roeckx <kurt@roeckx.be>
Date: Sat, 3 Sep 2016 19:27:30 +0000 (+0200)
Subject: Fix name of "locked" variable
X-Git-Tag: OpenSSL_1_1_1-pre1~3005
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0a3dce8257d62cd39a17ff7fdbb1fe4724146f7b;p=oweals%2Fopenssl.git

Fix name of "locked" variable

It's called with 0 when it's already locked, with 1 when it's not.

Reviewed-by: Andy Polyakov <appro@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>

GH: #1500
---

diff --git a/crypto/engine/eng_int.h b/crypto/engine/eng_int.h
index 741e6876b6..f7bc706f16 100644
--- a/crypto/engine/eng_int.h
+++ b/crypto/engine/eng_int.h
@@ -104,7 +104,7 @@ void engine_table_doall(ENGINE_TABLE *table, engine_table_doall_cb *cb,
  */
 int engine_unlocked_init(ENGINE *e);
 int engine_unlocked_finish(ENGINE *e, int unlock_for_handlers);
-int engine_free_util(ENGINE *e, int locked);
+int engine_free_util(ENGINE *e, int not_locked);
 
 /*
  * This function will reset all "set"able values in an ENGINE to NULL. This
diff --git a/crypto/engine/eng_lib.c b/crypto/engine/eng_lib.c
index 8a21f38028..385af54919 100644
--- a/crypto/engine/eng_lib.c
+++ b/crypto/engine/eng_lib.c
@@ -67,7 +67,7 @@ void engine_set_all_null(ENGINE *e)
     e->flags = 0;
 }
 
-int engine_free_util(ENGINE *e, int locked)
+int engine_free_util(ENGINE *e, int not_locked)
 {
     int i;
 
@@ -76,7 +76,7 @@ int engine_free_util(ENGINE *e, int locked)
 #ifdef HAVE_ATOMICS
     CRYPTO_DOWN_REF(&e->struct_ref, &i, global_engine_lock);
 #else
-    if (locked)
+    if (not_locked)
         CRYPTO_atomic_add(&e->struct_ref, -1, &i, global_engine_lock);
     else
         i = --e->struct_ref;