diff options
| author | Geoff Thorpe <geoff@openssl.org> | 2001-01-09 00:24:38 +0000 |
|---|---|---|
| committer | Geoff Thorpe <geoff@openssl.org> | 2001-01-09 00:24:38 +0000 |
| commit | 3c914840520161d9ca121d38973a79b050916a8a (patch) | |
| tree | 54e55c6caf32e0ec88ac04b6a7765f7452fc7739 /crypto/conf | |
| parent | 98d517c5dad7812f2df30f001356eb4cfa7fa6fc (diff) | |
Move all the existing function pointer casts associated with LHASH's two
"doall" functions to using type-safe wrappers. As and where required, this
can be replaced by redeclaring the underlying callbacks to use the
underlying "void"-based prototypes (eg. if performance suffers from an
extra level of function invocation).
Diffstat (limited to 'crypto/conf')
| -rw-r--r-- | crypto/conf/cnf_save.c | 7 | ||||
| -rw-r--r-- | crypto/conf/conf_api.c | 6 | ||||
| -rw-r--r-- | crypto/conf/conf_def.c | 4 |
3 files changed, 11 insertions, 6 deletions
diff --git a/crypto/conf/cnf_save.c b/crypto/conf/cnf_save.c index efbb61373e..1439487526 100644 --- a/crypto/conf/cnf_save.c +++ b/crypto/conf/cnf_save.c @@ -59,7 +59,8 @@ #include <stdio.h> #include <openssl/conf.h> -void print_conf(CONF_VALUE *cv); +static void print_conf(CONF_VALUE *cv); +static IMPLEMENT_LHASH_DOALL_FN(print_conf, CONF_VALUE *); main() { @@ -73,11 +74,11 @@ main() exit(1); } - lh_doall(conf,(LHASH_DOALL_FN_TYPE)print_conf); + lh_doall(conf,LHASH_DOALL_FN(print_conf)); } -void print_conf(CONF_VALUE *cv) +static void print_conf(CONF_VALUE *cv) { int i; CONF_VALUE *v; diff --git a/crypto/conf/conf_api.c b/crypto/conf/conf_api.c index bf84cecc1e..a0596bfd4a 100644 --- a/crypto/conf/conf_api.c +++ b/crypto/conf/conf_api.c @@ -70,6 +70,8 @@ static void value_free_hash(CONF_VALUE *a, LHASH *conf); static void value_free_stack(CONF_VALUE *a,LHASH *conf); +static IMPLEMENT_LHASH_DOALL_ARG_FN(value_free_hash, CONF_VALUE *, LHASH *) +static IMPLEMENT_LHASH_DOALL_ARG_FN(value_free_stack, CONF_VALUE *, LHASH *) /* We don't use function pointer casting or wrapper functions - but cast each * callback parameter inside the callback functions. */ /* static unsigned long hash(CONF_VALUE *v); */ @@ -198,13 +200,13 @@ void _CONF_free_data(CONF *conf) conf->data->down_load=0; /* evil thing to make sure the 'OPENSSL_free()' * works as expected */ - lh_doall_arg(conf->data, (LHASH_DOALL_ARG_FN_TYPE)value_free_hash, + lh_doall_arg(conf->data, LHASH_DOALL_ARG_FN(value_free_hash), conf->data); /* We now have only 'section' entries in the hash table. * Due to problems with */ - lh_doall_arg(conf->data, (LHASH_DOALL_ARG_FN_TYPE)value_free_stack, + lh_doall_arg(conf->data, LHASH_DOALL_ARG_FN(value_free_stack), conf->data); lh_free(conf->data); } diff --git a/crypto/conf/conf_def.c b/crypto/conf/conf_def.c index 1d30f6f771..59f9476dc6 100644 --- a/crypto/conf/conf_def.c +++ b/crypto/conf/conf_def.c @@ -710,9 +710,11 @@ static void dump_value(CONF_VALUE *a, BIO *out) BIO_printf(out, "[[%s]]\n", a->section); } +static IMPLEMENT_LHASH_DOALL_ARG_FN(dump_value, CONF_VALUE *, BIO *) + static int def_dump(CONF *conf, BIO *out) { - lh_doall_arg(conf->data, (LHASH_DOALL_ARG_FN_TYPE)dump_value, out); + lh_doall_arg(conf->data, LHASH_DOALL_ARG_FN(dump_value), out); return 1; } |