diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2015-12-24 16:20:54 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2016-01-11 17:50:27 +0000 |
| commit | 2a056de832a62f9c6da67779f3764f004df6fdb0 (patch) | |
| tree | 39cf79ccb16c14d4fdc208f58447a051266a8f66 /crypto/conf | |
| parent | 63c75cd688352b83afd7f874b89139e282647046 (diff) | |
Add lh_doall_arg inlining
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'crypto/conf')
| -rw-r--r-- | crypto/conf/conf_api.c | 16 | ||||
| -rw-r--r-- | crypto/conf/conf_def.c | 7 |
2 files changed, 10 insertions, 13 deletions
diff --git a/crypto/conf/conf_api.c b/crypto/conf/conf_api.c index 177807556f..eeb2349459 100644 --- a/crypto/conf/conf_api.c +++ b/crypto/conf/conf_api.c @@ -70,11 +70,8 @@ #include <openssl/conf_api.h> #include "e_os.h" -static void value_free_hash_doall_arg(CONF_VALUE *a, - LHASH_OF(CONF_VALUE) *conf); +static void value_free_hash(const CONF_VALUE *a, LHASH_OF(CONF_VALUE) *conf); static void value_free_stack_doall(CONF_VALUE *a); -static IMPLEMENT_LHASH_DOALL_ARG_FN(value_free_hash, CONF_VALUE, - LHASH_OF(CONF_VALUE)) /* Up until OpenSSL 0.9.5a, this was get_section */ CONF_VALUE *_CONF_get_section(const CONF *conf, const char *section) @@ -193,6 +190,10 @@ int _CONF_new_data(CONF *conf) return 1; } +typedef LHASH_OF(CONF_VALUE) LH_CONF_VALUE; + +IMPLEMENT_LHASH_DOALL_ARG_CONST(CONF_VALUE, LH_CONF_VALUE); + void _CONF_free_data(CONF *conf) { if (conf == NULL || conf->data == NULL) @@ -200,9 +201,7 @@ void _CONF_free_data(CONF *conf) /* evil thing to make sure the 'OPENSSL_free()' works as expected */ lh_CONF_VALUE_set_down_load(conf->data, 0); - lh_CONF_VALUE_doall_arg(conf->data, - LHASH_DOALL_ARG_FN(value_free_hash), - LHASH_OF(CONF_VALUE), conf->data); + lh_CONF_VALUE_doall_LH_CONF_VALUE(conf->data, value_free_hash, conf->data); /* * We now have only 'section' entries in the hash table. Due to problems @@ -213,8 +212,7 @@ void _CONF_free_data(CONF *conf) lh_CONF_VALUE_free(conf->data); } -static void value_free_hash_doall_arg(CONF_VALUE *a, - LHASH_OF(CONF_VALUE) *conf) +static void value_free_hash(const CONF_VALUE *a, LHASH_OF(CONF_VALUE) *conf) { if (a->name != NULL) (void)lh_CONF_VALUE_delete(conf, a); diff --git a/crypto/conf/conf_def.c b/crypto/conf/conf_def.c index ac074056d1..5d929f1a00 100644 --- a/crypto/conf/conf_def.c +++ b/crypto/conf/conf_def.c @@ -652,7 +652,7 @@ static char *scan_dquote(CONF *conf, char *p) return (p); } -static void dump_value_doall_arg(CONF_VALUE *a, BIO *out) +static void dump_value_doall_arg(const CONF_VALUE *a, BIO *out) { if (a->name) BIO_printf(out, "[%s] %s=%s\n", a->section, a->name, a->value); @@ -660,12 +660,11 @@ static void dump_value_doall_arg(CONF_VALUE *a, BIO *out) BIO_printf(out, "[[%s]]\n", a->section); } -static IMPLEMENT_LHASH_DOALL_ARG_FN(dump_value, CONF_VALUE, BIO) +IMPLEMENT_LHASH_DOALL_ARG_CONST(CONF_VALUE, BIO); static int def_dump(const CONF *conf, BIO *out) { - lh_CONF_VALUE_doall_arg(conf->data, LHASH_DOALL_ARG_FN(dump_value), - BIO, out); + lh_CONF_VALUE_doall_BIO(conf->data, dump_value_doall_arg, out); return 1; } |