diff options
| author | Ben Laurie <ben@openssl.org> | 2008-10-12 14:32:47 +0000 |
|---|---|---|
| committer | Ben Laurie <ben@openssl.org> | 2008-10-12 14:32:47 +0000 |
| commit | babb379849ffb4112792f266f92e9ebb2bd35332 (patch) | |
| tree | d401aa7a4af8cc1180fe602711897a50d8feb74f /crypto/asn1/a_strnid.c | |
| parent | 6665ef303e837ed45654d1b5dd42123e7a51b0f4 (diff) | |
| download | openssl-babb379849ffb4112792f266f92e9ebb2bd35332.zip openssl-babb379849ffb4112792f266f92e9ebb2bd35332.tar.gz openssl-babb379849ffb4112792f266f92e9ebb2bd35332.tar.bz2 | |
Type-checked (and modern C compliant) OBJ_bsearch.
Diffstat (limited to 'crypto/asn1/a_strnid.c')
| -rw-r--r-- | crypto/asn1/a_strnid.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/crypto/asn1/a_strnid.c b/crypto/asn1/a_strnid.c index ecf1d60..f0d5416 100644 --- a/crypto/asn1/a_strnid.c +++ b/crypto/asn1/a_strnid.c @@ -67,7 +67,6 @@ static STACK_OF(ASN1_STRING_TABLE) *stable = NULL; static void st_free(ASN1_STRING_TABLE *tbl); static int sk_table_cmp(const ASN1_STRING_TABLE * const *a, const ASN1_STRING_TABLE * const *b); -static int table_cmp(const void *a, const void *b); /* This is the global mask for the mbstring functions: this is use to @@ -186,22 +185,25 @@ static int sk_table_cmp(const ASN1_STRING_TABLE * const *a, return (*a)->nid - (*b)->nid; } -static int table_cmp(const void *a, const void *b) +DECLARE_OBJ_BSEARCH_CMP_FN(ASN1_STRING_TABLE, ASN1_STRING_TABLE, table_cmp); + +static int table_cmp(const ASN1_STRING_TABLE *a, const ASN1_STRING_TABLE *b) { - const ASN1_STRING_TABLE *sa = a, *sb = b; - return sa->nid - sb->nid; + return a->nid - b->nid; } +IMPLEMENT_OBJ_BSEARCH_CMP_FN(ASN1_STRING_TABLE, ASN1_STRING_TABLE, table_cmp); + ASN1_STRING_TABLE *ASN1_STRING_TABLE_get(int nid) { int idx; ASN1_STRING_TABLE *ttmp; ASN1_STRING_TABLE fnd; fnd.nid = nid; - ttmp = (ASN1_STRING_TABLE *) OBJ_bsearch((char *)&fnd, - (char *)tbl_standard, - sizeof(tbl_standard)/sizeof(ASN1_STRING_TABLE), - sizeof(ASN1_STRING_TABLE), table_cmp); + ttmp = OBJ_bsearch(ASN1_STRING_TABLE, &fnd, + ASN1_STRING_TABLE, tbl_standard, + sizeof(tbl_standard)/sizeof(ASN1_STRING_TABLE), + table_cmp); if(ttmp) return ttmp; if(!stable) return NULL; idx = sk_ASN1_STRING_TABLE_find(stable, &fnd); |