diff options
Diffstat (limited to 'crypto/stack/stack.c')
| -rw-r--r-- | crypto/stack/stack.c | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/crypto/stack/stack.c b/crypto/stack/stack.c index 51080b876797..f0a784f29ae4 100644 --- a/crypto/stack/stack.c +++ b/crypto/stack/stack.c @@ -12,14 +12,15 @@ #include "internal/numbers.h" #include <openssl/stack.h> #include <errno.h> -#include <openssl/e_os2.h> /* For ossl_inline */ +#include <openssl/e_os2.h> /* For ossl_inline */ /* * The initial number of nodes in the array. */ static const int min_nodes = 4; static const int max_nodes = SIZE_MAX / sizeof(void *) < INT_MAX - ? (int)(SIZE_MAX / sizeof(void *)) : INT_MAX; + ? (int)(SIZE_MAX / sizeof(void *)) + : INT_MAX; struct stack_st { int num; @@ -30,7 +31,7 @@ struct stack_st { }; OPENSSL_sk_compfunc OPENSSL_sk_set_cmp_func(OPENSSL_STACK *sk, - OPENSSL_sk_compfunc c) + OPENSSL_sk_compfunc c) { OPENSSL_sk_compfunc old = sk->comp; @@ -71,15 +72,15 @@ OPENSSL_STACK *OPENSSL_sk_dup(const OPENSSL_STACK *sk) memcpy(ret->data, sk->data, sizeof(void *) * sk->num); return ret; - err: +err: ERR_raise(ERR_LIB_CRYPTO, ERR_R_MALLOC_FAILURE); OPENSSL_sk_free(ret); return NULL; } OPENSSL_STACK *OPENSSL_sk_deep_copy(const OPENSSL_STACK *sk, - OPENSSL_sk_copyfunc copy_func, - OPENSSL_sk_freefunc free_func) + OPENSSL_sk_copyfunc copy_func, + OPENSSL_sk_freefunc free_func) { OPENSSL_STACK *ret; int i; @@ -120,7 +121,7 @@ OPENSSL_STACK *OPENSSL_sk_deep_copy(const OPENSSL_STACK *sk, } return ret; - err: +err: ERR_raise(ERR_LIB_CRYPTO, ERR_R_MALLOC_FAILURE); OPENSSL_sk_free(ret); return NULL; @@ -275,7 +276,7 @@ int OPENSSL_sk_insert(OPENSSL_STACK *st, const void *data, int loc) st->data[st->num] = data; } else { memmove(&st->data[loc + 1], &st->data[loc], - sizeof(st->data[0]) * (st->num - loc)); + sizeof(st->data[0]) * (st->num - loc)); st->data[loc] = data; } st->num++; @@ -289,7 +290,7 @@ static ossl_inline void *internal_delete(OPENSSL_STACK *st, int loc) if (loc != st->num - 1) memmove(&st->data[loc], &st->data[loc + 1], - sizeof(st->data[0]) * (st->num - loc - 1)); + sizeof(st->data[0]) * (st->num - loc - 1)); st->num--; return (void *)ret; @@ -317,7 +318,7 @@ void *OPENSSL_sk_delete(OPENSSL_STACK *st, int loc) } static int internal_find(OPENSSL_STACK *st, const void *data, - int ret_val_options, int *pnum) + int ret_val_options, int *pnum) { const void *r; int i; @@ -347,7 +348,7 @@ static int internal_find(OPENSSL_STACK *st, const void *data, if (pnum != NULL) ret_val_options |= OSSL_BSEARCH_FIRST_VALUE_ON_MATCH; r = ossl_bsearch(&data, st->data, st->num, sizeof(void *), st->comp, - ret_val_options); + ret_val_options); if (pnum != NULL) { *pnum = 0; @@ -455,7 +456,7 @@ void *OPENSSL_sk_set(OPENSSL_STACK *st, int i, const void *data) } if (i < 0 || i >= st->num) { ERR_raise_data(ERR_LIB_CRYPTO, ERR_R_PASSED_INVALID_ARGUMENT, - "i=%d", i); + "i=%d", i); return NULL; } st->data[i] = data; |
