diff options
| author | Ben Laurie <ben@openssl.org> | 2008-06-04 11:01:43 +0000 |
|---|---|---|
| committer | Ben Laurie <ben@openssl.org> | 2008-06-04 11:01:43 +0000 |
| commit | 5ce278a77bd7d23bcf965cfa37afb7b937c1a17d (patch) | |
| tree | a69f3fe7e5a7e222cdd1e9314e671ffbcf79fc27 /crypto/ex_data.c | |
| parent | 37cf49a3df4b0094c5d335008705518e93b2dad2 (diff) | |
| download | openssl-new-5ce278a77bd7d23bcf965cfa37afb7b937c1a17d.tar.gz | |
More type-checking.
Diffstat (limited to 'crypto/ex_data.c')
| -rw-r--r-- | crypto/ex_data.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/crypto/ex_data.c b/crypto/ex_data.c index 9e7157da1f..528689edb5 100644 --- a/crypto/ex_data.c +++ b/crypto/ex_data.c @@ -456,7 +456,7 @@ static int int_dup_ex_data(int class_index, CRYPTO_EX_DATA *to, return 0; CRYPTO_r_lock(CRYPTO_LOCK_EX_DATA); mx = sk_CRYPTO_EX_DATA_FUNCS_num(item->meth); - j = sk_num(from->sk); + j = sk_void_num(from->sk); if(j < mx) mx = j; if(mx > 0) @@ -527,7 +527,7 @@ skip: OPENSSL_free(storage); if(ad->sk) { - sk_free(ad->sk); + sk_void_free(ad->sk); ad->sk=NULL; } } @@ -600,24 +600,24 @@ int CRYPTO_set_ex_data(CRYPTO_EX_DATA *ad, int idx, void *val) if (ad->sk == NULL) { - if ((ad->sk=sk_new_null()) == NULL) + if ((ad->sk=sk_void_new_null()) == NULL) { CRYPTOerr(CRYPTO_F_CRYPTO_SET_EX_DATA,ERR_R_MALLOC_FAILURE); return(0); } } - i=sk_num(ad->sk); + i=sk_void_num(ad->sk); while (i <= idx) { - if (!sk_push(ad->sk,NULL)) + if (!sk_void_push(ad->sk,NULL)) { CRYPTOerr(CRYPTO_F_CRYPTO_SET_EX_DATA,ERR_R_MALLOC_FAILURE); return(0); } i++; } - sk_set(ad->sk,idx,val); + sk_void_set(ad->sk,idx,val); return(1); } @@ -627,10 +627,10 @@ void *CRYPTO_get_ex_data(const CRYPTO_EX_DATA *ad, int idx) { if (ad->sk == NULL) return(0); - else if (idx >= sk_num(ad->sk)) + else if (idx >= sk_void_num(ad->sk)) return(0); else - return(sk_value(ad->sk,idx)); + return(sk_void_value(ad->sk,idx)); } IMPLEMENT_STACK_OF(CRYPTO_EX_DATA_FUNCS) |