From 63c75cd688352b83afd7f874b89139e282647046 Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Thu, 24 Dec 2015 16:07:21 +0000 Subject: Add lh_doall inlining Reviewed-by: Rich Salz --- crypto/conf/conf_api.c | 3 +-- crypto/engine/eng_table.c | 5 +---- crypto/objects/o_names.c | 4 +--- crypto/objects/obj_dat.c | 10 +++------- 4 files changed, 6 insertions(+), 16 deletions(-) (limited to 'crypto') diff --git a/crypto/conf/conf_api.c b/crypto/conf/conf_api.c index 408e49725c..177807556f 100644 --- a/crypto/conf/conf_api.c +++ b/crypto/conf/conf_api.c @@ -75,7 +75,6 @@ static void value_free_hash_doall_arg(CONF_VALUE *a, static void value_free_stack_doall(CONF_VALUE *a); static IMPLEMENT_LHASH_DOALL_ARG_FN(value_free_hash, CONF_VALUE, LHASH_OF(CONF_VALUE)) -static IMPLEMENT_LHASH_DOALL_FN(value_free_stack, CONF_VALUE) /* Up until OpenSSL 0.9.5a, this was get_section */ CONF_VALUE *_CONF_get_section(const CONF *conf, const char *section) @@ -210,7 +209,7 @@ void _CONF_free_data(CONF *conf) * with */ - lh_CONF_VALUE_doall(conf->data, LHASH_DOALL_FN(value_free_stack)); + lh_CONF_VALUE_doall(conf->data, value_free_stack_doall); lh_CONF_VALUE_free(conf->data); } diff --git a/crypto/engine/eng_table.c b/crypto/engine/eng_table.c index 220d632bda..ad15f3a51c 100644 --- a/crypto/engine/eng_table.c +++ b/crypto/engine/eng_table.c @@ -219,14 +219,11 @@ static void int_cleanup_cb_doall(ENGINE_PILE *p) OPENSSL_free(p); } -static IMPLEMENT_LHASH_DOALL_FN(int_cleanup_cb, ENGINE_PILE) - void engine_table_cleanup(ENGINE_TABLE **table) { CRYPTO_w_lock(CRYPTO_LOCK_ENGINE); if (*table) { - lh_ENGINE_PILE_doall(&(*table)->piles, - LHASH_DOALL_FN(int_cleanup_cb)); + lh_ENGINE_PILE_doall(&(*table)->piles, int_cleanup_cb_doall); lh_ENGINE_PILE_free(&(*table)->piles); *table = NULL; } diff --git a/crypto/objects/o_names.c b/crypto/objects/o_names.c index f7216f210e..d63575dc84 100644 --- a/crypto/objects/o_names.c +++ b/crypto/objects/o_names.c @@ -320,8 +320,6 @@ static void names_lh_free_doall(OBJ_NAME *onp) OBJ_NAME_remove(onp->name, onp->type); } -static IMPLEMENT_LHASH_DOALL_FN(names_lh_free, OBJ_NAME) - static void name_funcs_free(NAME_FUNCS *ptr) { OPENSSL_free(ptr); @@ -338,7 +336,7 @@ void OBJ_NAME_cleanup(int type) down_load = lh_OBJ_NAME_get_down_load(names_lh); lh_OBJ_NAME_set_down_load(names_lh, 0); - lh_OBJ_NAME_doall(names_lh, LHASH_DOALL_FN(names_lh_free)); + lh_OBJ_NAME_doall(names_lh, names_lh_free_doall); if (type < 0) { lh_OBJ_NAME_free(names_lh); sk_NAME_FUNCS_pop_free(name_funcs_stack, name_funcs_free); diff --git a/crypto/objects/obj_dat.c b/crypto/objects/obj_dat.c index cbd6e346c1..3983ebe770 100644 --- a/crypto/objects/obj_dat.c +++ b/crypto/objects/obj_dat.c @@ -199,10 +199,6 @@ static void cleanup3_doall(ADDED_OBJ *a) OPENSSL_free(a); } -static IMPLEMENT_LHASH_DOALL_FN(cleanup1, ADDED_OBJ) -static IMPLEMENT_LHASH_DOALL_FN(cleanup2, ADDED_OBJ) -static IMPLEMENT_LHASH_DOALL_FN(cleanup3, ADDED_OBJ) - /* * The purpose of obj_cleanup_defer is to avoid EVP_cleanup() attempting to * use freed up OIDs. If necessary the actual freeing up of OIDs is delayed. @@ -224,9 +220,9 @@ void OBJ_cleanup(void) if (added == NULL) return; lh_ADDED_OBJ_set_down_load(added, 0); - lh_ADDED_OBJ_doall(added, LHASH_DOALL_FN(cleanup1)); /* zero counters */ - lh_ADDED_OBJ_doall(added, LHASH_DOALL_FN(cleanup2)); /* set counters */ - lh_ADDED_OBJ_doall(added, LHASH_DOALL_FN(cleanup3)); /* free objects */ + lh_ADDED_OBJ_doall(added, cleanup1_doall); /* zero counters */ + lh_ADDED_OBJ_doall(added, cleanup2_doall); /* set counters */ + lh_ADDED_OBJ_doall(added, cleanup3_doall); /* free objects */ lh_ADDED_OBJ_free(added); added = NULL; } -- cgit v1.2.3