diff options
| author | Rich Salz <rsalz@openssl.org> | 2016-08-04 16:50:19 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-08-10 09:53:58 -0400 |
| commit | 3663990760f9e414c50f3a73fa7276b4b528ef41 (patch) | |
| tree | fe08f11df02fd339d5041c82ac16c4789ee2ac98 /include | |
| parent | 446dffa7f6abf5400adac9c7814440b5af3b7edd (diff) | |
Add some const casts
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1397)
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/safestack.h | 10 | ||||
| -rw-r--r-- | include/openssl/stack.h | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/include/openssl/safestack.h b/include/openssl/safestack.h index 7877fd98a3..9fe733c24e 100644 --- a/include/openssl/safestack.h +++ b/include/openssl/safestack.h @@ -59,11 +59,11 @@ extern "C" { } \ static ossl_inline int sk_##t1##_push(STACK_OF(t1) *sk, t2 *ptr) \ { \ - return OPENSSL_sk_push((OPENSSL_STACK *)sk, (void *)ptr); \ + return OPENSSL_sk_push((OPENSSL_STACK *)sk, (const void *)ptr); \ } \ static ossl_inline int sk_##t1##_unshift(STACK_OF(t1) *sk, t2 *ptr) \ { \ - return OPENSSL_sk_unshift((OPENSSL_STACK *)sk, (void *)ptr); \ + return OPENSSL_sk_unshift((OPENSSL_STACK *)sk, (const void *)ptr); \ } \ static ossl_inline t2 *sk_##t1##_pop(STACK_OF(t1) *sk) \ { \ @@ -79,11 +79,11 @@ extern "C" { } \ static ossl_inline int sk_##t1##_insert(STACK_OF(t1) *sk, t2 *ptr, int idx) \ { \ - return OPENSSL_sk_insert((OPENSSL_STACK *)sk, (void *)ptr, idx); \ + return OPENSSL_sk_insert((OPENSSL_STACK *)sk, (const void *)ptr, idx); \ } \ static ossl_inline t2 *sk_##t1##_set(STACK_OF(t1) *sk, int idx, t2 *ptr) \ { \ - return (t2 *)OPENSSL_sk_set((OPENSSL_STACK *)sk, idx, (void *)ptr); \ + return (t2 *)OPENSSL_sk_set((OPENSSL_STACK *)sk, idx, (const void *)ptr); \ } \ static ossl_inline int sk_##t1##_find(STACK_OF(t1) *sk, t2 *ptr) \ { \ @@ -109,7 +109,7 @@ extern "C" { sk_##t1##_copyfunc copyfunc, \ sk_##t1##_freefunc freefunc) \ { \ - return (STACK_OF(t1) *)OPENSSL_sk_deep_copy((OPENSSL_STACK *)sk, \ + return (STACK_OF(t1) *)OPENSSL_sk_deep_copy((const OPENSSL_STACK *)sk, \ (OPENSSL_sk_copyfunc)copyfunc, \ (OPENSSL_sk_freefunc)freefunc); \ } \ diff --git a/include/openssl/stack.h b/include/openssl/stack.h index ae47be926d..23ad3b89f9 100644 --- a/include/openssl/stack.h +++ b/include/openssl/stack.h @@ -23,20 +23,20 @@ typedef void *(*OPENSSL_sk_copyfunc)(const void *); int OPENSSL_sk_num(const OPENSSL_STACK *); void *OPENSSL_sk_value(const OPENSSL_STACK *, int); -void *OPENSSL_sk_set(OPENSSL_STACK *, int, void *); +void *OPENSSL_sk_set(OPENSSL_STACK *st, int i, const void *data); OPENSSL_STACK *OPENSSL_sk_new(OPENSSL_sk_compfunc cmp); OPENSSL_STACK *OPENSSL_sk_new_null(void); void OPENSSL_sk_free(OPENSSL_STACK *); void OPENSSL_sk_pop_free(OPENSSL_STACK *st, void (*func) (void *)); OPENSSL_STACK *OPENSSL_sk_deep_copy(const OPENSSL_STACK *, OPENSSL_sk_copyfunc c, OPENSSL_sk_freefunc f); -int OPENSSL_sk_insert(OPENSSL_STACK *sk, void *data, int where); +int OPENSSL_sk_insert(OPENSSL_STACK *sk, const void *data, int where); void *OPENSSL_sk_delete(OPENSSL_STACK *st, int loc); void *OPENSSL_sk_delete_ptr(OPENSSL_STACK *st, const void *p); int OPENSSL_sk_find(OPENSSL_STACK *st, const void *data); int OPENSSL_sk_find_ex(OPENSSL_STACK *st, const void *data); -int OPENSSL_sk_push(OPENSSL_STACK *st, void *data); -int OPENSSL_sk_unshift(OPENSSL_STACK *st, void *data); +int OPENSSL_sk_push(OPENSSL_STACK *st, const void *data); +int OPENSSL_sk_unshift(OPENSSL_STACK *st, const void *data); void *OPENSSL_sk_shift(OPENSSL_STACK *st); void *OPENSSL_sk_pop(OPENSSL_STACK *st); void OPENSSL_sk_zero(OPENSSL_STACK *st); |