diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2015-05-02 18:30:00 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2015-05-03 12:53:08 +0100 |
| commit | b6eb9827a6866981c08cc9613ca8b4a648894fb1 (patch) | |
| tree | c5a6351461d8be964bc1f31fa2e34c4ebb7cfafd /crypto/asn1/a_strnid.c | |
| parent | 31ff45aa975acb43f1da20e714eadf4649655714 (diff) | |
| download | openssl-b6eb9827a6866981c08cc9613ca8b4a648894fb1.zip openssl-b6eb9827a6866981c08cc9613ca8b4a648894fb1.tar.gz openssl-b6eb9827a6866981c08cc9613ca8b4a648894fb1.tar.bz2 | |
Add OSSL_NELEM macro.
Add OSSL_NELEM macro to e_os.h to determine the number of elements in an
array.
Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'crypto/asn1/a_strnid.c')
| -rw-r--r-- | crypto/asn1/a_strnid.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/crypto/asn1/a_strnid.c b/crypto/asn1/a_strnid.c index 213cf63..5126298 100644 --- a/crypto/asn1/a_strnid.c +++ b/crypto/asn1/a_strnid.c @@ -220,9 +220,7 @@ ASN1_STRING_TABLE *ASN1_STRING_TABLE_get(int nid) if (idx >= 0) return sk_ASN1_STRING_TABLE_value(stable, idx); } - return OBJ_bsearch_table(&fnd, tbl_standard, - sizeof(tbl_standard) / - sizeof(ASN1_STRING_TABLE)); + return OBJ_bsearch_table(&fnd, tbl_standard, OSSL_NELEM(tbl_standard)); } /* @@ -309,8 +307,7 @@ main() ASN1_STRING_TABLE *tmp; int i, last_nid = -1; - for (tmp = tbl_standard, i = 0; - i < sizeof(tbl_standard) / sizeof(ASN1_STRING_TABLE); i++, tmp++) { + for (tmp = tbl_standard, i = 0; i < OSSL_NELEM(tbl_standard); i++, tmp++) { if (tmp->nid < last_nid) { last_nid = 0; break; @@ -323,8 +320,7 @@ main() exit(0); } - for (tmp = tbl_standard, i = 0; - i < sizeof(tbl_standard) / sizeof(ASN1_STRING_TABLE); i++, tmp++) + for (tmp = tbl_standard, i = 0; i < OSSL_NELEM(tbl_standard); i++, tmp++) printf("Index %d, NID %d, Name=%s\n", i, tmp->nid, OBJ_nid2ln(tmp->nid)); |