summaryrefslogtreecommitdiffstats
path: root/crypto/engine
diff options
context:
space:
mode:
authorKurt Roeckx <kurt@roeckx.be>2016-09-03 21:27:30 +0200
committerKurt Roeckx <kurt@roeckx.be>2016-11-17 22:02:25 +0100
commit0a3dce8257d62cd39a17ff7fdbb1fe4724146f7b (patch)
treeb69a8fdfff96cc47741a6d219eae7548e0d8089f /crypto/engine
parent2f545ae45d4b93649e40ff7f93e2c3e6ce3154ae (diff)
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
Diffstat (limited to 'crypto/engine')
-rw-r--r--crypto/engine/eng_int.h2
-rw-r--r--crypto/engine/eng_lib.c4
2 files changed, 3 insertions, 3 deletions
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;