diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2015-12-24 15:51:23 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2016-01-11 17:50:27 +0000 |
| commit | 62d0577e0d5e3703436d0fba362d516481291810 (patch) | |
| tree | 5298b79f976f3264b244acba116fcdfbc8172a93 /crypto/conf/conf_api.c | |
| parent | e6b5c341b94d357b0158ad74b12edd51399a4b87 (diff) | |
Add lh_new() inlining
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'crypto/conf/conf_api.c')
| -rw-r--r-- | crypto/conf/conf_api.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/crypto/conf/conf_api.c b/crypto/conf/conf_api.c index 3421ee3d00..408e49725c 100644 --- a/crypto/conf/conf_api.c +++ b/crypto/conf/conf_api.c @@ -162,8 +162,6 @@ static unsigned long conf_value_hash(const CONF_VALUE *v) return (lh_strhash(v->section) << 2) ^ lh_strhash(v->name); } -static IMPLEMENT_LHASH_HASH_FN(conf_value, CONF_VALUE) - static int conf_value_cmp(const CONF_VALUE *a, const CONF_VALUE *b) { int i; @@ -183,17 +181,16 @@ static int conf_value_cmp(const CONF_VALUE *a, const CONF_VALUE *b) return ((a->name == NULL) ? -1 : 1); } -static IMPLEMENT_LHASH_COMP_FN(conf_value, CONF_VALUE) - int _CONF_new_data(CONF *conf) { if (conf == NULL) { return 0; } - if (conf->data == NULL) - if ((conf->data = lh_CONF_VALUE_new()) == NULL) { + if (conf->data == NULL) { + conf->data = lh_CONF_VALUE_new(conf_value_hash, conf_value_cmp); + if (conf->data == NULL) return 0; - } + } return 1; } |