diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2016-05-21 16:31:09 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2016-05-21 22:49:00 +0100 |
| commit | 4591e5fb4168eb81d198a236d265d87256bf67c1 (patch) | |
| tree | 4b270d1c017918aa0944bdaaa111140709ebe3de /crypto/stack | |
| parent | 8bf780432c11bcedf20161f5e76bc19e300af419 (diff) | |
Constify stack and lhash macros.
RT#4471
Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'crypto/stack')
| -rw-r--r-- | crypto/stack/stack.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/crypto/stack/stack.c b/crypto/stack/stack.c index 36fc921aa3..0076db139d 100644 --- a/crypto/stack/stack.c +++ b/crypto/stack/stack.c @@ -142,14 +142,14 @@ int OPENSSL_sk_insert(OPENSSL_STACK *st, void *data, int loc) return (st->num); } -void *OPENSSL_sk_delete_ptr(OPENSSL_STACK *st, void *p) +void *OPENSSL_sk_delete_ptr(OPENSSL_STACK *st, const void *p) { int i; for (i = 0; i < st->num; i++) if (st->data[i] == p) - return (OPENSSL_sk_delete(st, i)); - return (NULL); + return OPENSSL_sk_delete(st, i); + return NULL; } void *OPENSSL_sk_delete(OPENSSL_STACK *st, int loc) @@ -174,7 +174,8 @@ void *OPENSSL_sk_delete(OPENSSL_STACK *st, int loc) return (ret); } -static int internal_find(OPENSSL_STACK *st, void *data, int ret_val_options) +static int internal_find(OPENSSL_STACK *st, const void *data, + int ret_val_options) { const void *const *r; int i; @@ -198,12 +199,12 @@ static int internal_find(OPENSSL_STACK *st, void *data, int ret_val_options) return (int)((char **)r - st->data); } -int OPENSSL_sk_find(OPENSSL_STACK *st, void *data) +int OPENSSL_sk_find(OPENSSL_STACK *st, const void *data) { return internal_find(st, data, OBJ_BSEARCH_FIRST_VALUE_ON_MATCH); } -int OPENSSL_sk_find_ex(OPENSSL_STACK *st, void *data) +int OPENSSL_sk_find_ex(OPENSSL_STACK *st, const void *data) { return internal_find(st, data, OBJ_BSEARCH_VALUE_ON_NOMATCH); } |