diff options
| author | Rich Salz <rsalz@openssl.org> | 2016-05-20 16:46:29 +0200 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-05-20 16:48:29 +0200 |
| commit | 739a1eb1961cdc3b1597a040766f3cb359d095f6 (patch) | |
| tree | da90e8dd33e1aa605351b529713901bb1b0f37b8 /crypto/txt_db | |
| parent | Clean up the VMS hacks in crypto/rand/randfile.c (diff) | |
| download | openssl-739a1eb1961cdc3b1597a040766f3cb359d095f6.tar.xz openssl-739a1eb1961cdc3b1597a040766f3cb359d095f6.zip | |
Rename lh_xxx,sk_xxx tp OPENSSL_{LH,SK}_xxx
Rename sk_xxx to OPENSSL_sk_xxx and _STACK to OPENSSL_STACK
Rename lh_xxx API to OPENSSL_LH_xxx and LHASH_NODE to OPENSSL_LH_NODE
Make lhash stuff opaque.
Use typedefs for function pointers; makes the code simpler.
Remove CHECKED_xxx macros.
Add documentation; remove old X509-oriented doc.
Add API-compat names for entire old API
Reviewed-by: Dr. Stephen Henson <steve@openssl.org>
Diffstat (limited to 'crypto/txt_db')
| -rw-r--r-- | crypto/txt_db/txt_db.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/txt_db/txt_db.c b/crypto/txt_db/txt_db.c index 6bc026231c..14322309a7 100644 --- a/crypto/txt_db/txt_db.c +++ b/crypto/txt_db/txt_db.c @@ -145,7 +145,7 @@ OPENSSL_STRING *TXT_DB_get_by_index(TXT_DB *db, int idx, } int TXT_DB_create_index(TXT_DB *db, int field, int (*qual) (OPENSSL_STRING *), - LHASH_HASH_FN_TYPE hash, LHASH_COMP_FN_TYPE cmp) + OPENSSL_LH_HASHFUNC hash, OPENSSL_LH_COMPFUNC cmp) { LHASH_OF(OPENSSL_STRING) *idx; OPENSSL_STRING *r; @@ -156,7 +156,7 @@ int TXT_DB_create_index(TXT_DB *db, int field, int (*qual) (OPENSSL_STRING *), return (0); } /* FIXME: we lose type checking at this point */ - if ((idx = (LHASH_OF(OPENSSL_STRING) *)lh_new(hash, cmp)) == NULL) { + if ((idx = (LHASH_OF(OPENSSL_STRING) *)OPENSSL_LH_new(hash, cmp)) == NULL) { db->error = DB_ERROR_MALLOC; return (0); } |