diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/crypto/sparse_array.h | 71 |
1 files changed, 37 insertions, 34 deletions
diff --git a/include/crypto/sparse_array.h b/include/crypto/sparse_array.h index 87b5adec9c..7ef7428379 100644 --- a/include/crypto/sparse_array.h +++ b/include/crypto/sparse_array.h @@ -25,44 +25,48 @@ extern "C" { static ossl_unused ossl_inline SPARSE_ARRAY_OF(type) * \ ossl_sa_##type##_new(void) \ { \ - return (SPARSE_ARRAY_OF(type) *)OPENSSL_SA_new(); \ + return (SPARSE_ARRAY_OF(type) *)ossl_sa_new(); \ } \ - static ossl_unused ossl_inline void ossl_sa_##type##_free(SPARSE_ARRAY_OF(type) *sa) \ + static ossl_unused ossl_inline void \ + ossl_sa_##type##_free(SPARSE_ARRAY_OF(type) *sa) \ { \ - OPENSSL_SA_free((OPENSSL_SA *)sa); \ + ossl_sa_free((OPENSSL_SA *)sa); \ } \ - static ossl_unused ossl_inline void ossl_sa_##type##_free_leaves(SPARSE_ARRAY_OF(type) *sa) \ + static ossl_unused ossl_inline void \ + ossl_sa_##type##_free_leaves(SPARSE_ARRAY_OF(type) *sa) \ { \ - OPENSSL_SA_free_leaves((OPENSSL_SA *)sa); \ + ossl_sa_free_leaves((OPENSSL_SA *)sa); \ } \ - static ossl_unused ossl_inline size_t ossl_sa_##type##_num(const SPARSE_ARRAY_OF(type) *sa) \ + static ossl_unused ossl_inline size_t \ + ossl_sa_##type##_num(const SPARSE_ARRAY_OF(type) *sa) \ { \ - return OPENSSL_SA_num((OPENSSL_SA *)sa); \ + return ossl_sa_num((OPENSSL_SA *)sa); \ } \ - static ossl_unused ossl_inline void ossl_sa_##type##_doall(const SPARSE_ARRAY_OF(type) *sa, \ - void (*leaf)(ossl_uintmax_t, \ - type *)) \ + static ossl_unused ossl_inline void \ + ossl_sa_##type##_doall(const SPARSE_ARRAY_OF(type) *sa, \ + void (*leaf)(ossl_uintmax_t, type *)) \ { \ - OPENSSL_SA_doall((OPENSSL_SA *)sa, (void (*)(ossl_uintmax_t, void *))leaf); \ + ossl_sa_doall((OPENSSL_SA *)sa, \ + (void (*)(ossl_uintmax_t, void *))leaf); \ } \ - static ossl_unused ossl_inline \ - void ossl_sa_##type##_doall_arg(const SPARSE_ARRAY_OF(type) *sa, \ - void (*leaf)(ossl_uintmax_t, type *, void *), \ - void *arg) \ + static ossl_unused ossl_inline void \ + ossl_sa_##type##_doall_arg(const SPARSE_ARRAY_OF(type) *sa, \ + void (*leaf)(ossl_uintmax_t, type *, void *), \ + void *arg) \ { \ - OPENSSL_SA_doall_arg((OPENSSL_SA *)sa, (void (*)(ossl_uintmax_t, void *, \ - void *))leaf, \ - arg); \ + ossl_sa_doall_arg((OPENSSL_SA *)sa, \ + (void (*)(ossl_uintmax_t, void *, void *))leaf, arg); \ } \ - static ossl_unused ossl_inline ctype *ossl_sa_##type##_get(const SPARSE_ARRAY_OF(type) *sa, \ - ossl_uintmax_t n) \ + static ossl_unused ossl_inline ctype \ + *ossl_sa_##type##_get(const SPARSE_ARRAY_OF(type) *sa, ossl_uintmax_t n) \ { \ - return (type *)OPENSSL_SA_get((OPENSSL_SA *)sa, n); \ + return (type *)ossl_sa_get((OPENSSL_SA *)sa, n); \ } \ - static ossl_unused ossl_inline int ossl_sa_##type##_set(SPARSE_ARRAY_OF(type) *sa, \ - ossl_uintmax_t n, ctype *val) \ + static ossl_unused ossl_inline int \ + ossl_sa_##type##_set(SPARSE_ARRAY_OF(type) *sa, \ + ossl_uintmax_t n, ctype *val) \ { \ - return OPENSSL_SA_set((OPENSSL_SA *)sa, n, (void *)val); \ + return ossl_sa_set((OPENSSL_SA *)sa, n, (void *)val); \ } \ SPARSE_ARRAY_OF(type) @@ -72,16 +76,15 @@ extern "C" { DEFINE_SPARSE_ARRAY_OF_INTERNAL(type, const type) typedef struct sparse_array_st OPENSSL_SA; -OPENSSL_SA *OPENSSL_SA_new(void); -void OPENSSL_SA_free(OPENSSL_SA *sa); -void OPENSSL_SA_free_leaves(OPENSSL_SA *sa); -size_t OPENSSL_SA_num(const OPENSSL_SA *sa); -void OPENSSL_SA_doall(const OPENSSL_SA *sa, - void (*leaf)(ossl_uintmax_t, void *)); -void OPENSSL_SA_doall_arg(const OPENSSL_SA *sa, - void (*leaf)(ossl_uintmax_t, void *, void *), void *); -void *OPENSSL_SA_get(const OPENSSL_SA *sa, ossl_uintmax_t n); -int OPENSSL_SA_set(OPENSSL_SA *sa, ossl_uintmax_t n, void *val); +OPENSSL_SA *ossl_sa_new(void); +void ossl_sa_free(OPENSSL_SA *sa); +void ossl_sa_free_leaves(OPENSSL_SA *sa); +size_t ossl_sa_num(const OPENSSL_SA *sa); +void ossl_sa_doall(const OPENSSL_SA *sa, void (*leaf)(ossl_uintmax_t, void *)); +void ossl_sa_doall_arg(const OPENSSL_SA *sa, + void (*leaf)(ossl_uintmax_t, void *, void *), void *); +void *ossl_sa_get(const OPENSSL_SA *sa, ossl_uintmax_t n); +int ossl_sa_set(OPENSSL_SA *sa, ossl_uintmax_t n, void *val); # ifdef __cplusplus } |