diff options
author | Dr. Stephen Henson <steve@openssl.org> | 2016-01-11 15:22:30 +0000 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 2016-01-11 17:50:42 +0000 |
commit | 89d6aa10a24c0d5195e5a4c21f99919c53fe69ac (patch) | |
tree | 3de1d604913aaf30541bc588ce261094f2634bda /include/openssl | |
parent | 26a884c217b4868ddc7cd2c2006e12a6bd6a7950 (diff) | |
download | openssl-89d6aa10a24c0d5195e5a4c21f99919c53fe69ac.zip openssl-89d6aa10a24c0d5195e5a4c21f99919c53fe69ac.tar.gz openssl-89d6aa10a24c0d5195e5a4c21f99919c53fe69ac.tar.bz2 |
Use ossl_inline and DEFINE_LHASH_OF
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'include/openssl')
-rw-r--r-- | include/openssl/conf.h | 2 | ||||
-rw-r--r-- | include/openssl/err.h | 2 | ||||
-rw-r--r-- | include/openssl/lhash.h | 34 |
3 files changed, 19 insertions, 19 deletions
diff --git a/include/openssl/conf.h b/include/openssl/conf.h index 1183072..81b7b95 100644 --- a/include/openssl/conf.h +++ b/include/openssl/conf.h @@ -78,7 +78,7 @@ typedef struct { } CONF_VALUE; DEFINE_STACK_OF(CONF_VALUE) -DECLARE_LHASH_OF(CONF_VALUE); +DEFINE_LHASH_OF(CONF_VALUE); struct conf_st; struct conf_method_st; diff --git a/include/openssl/err.h b/include/openssl/err.h index e763731..df9cab2 100644 --- a/include/openssl/err.h +++ b/include/openssl/err.h @@ -315,7 +315,7 @@ typedef struct ERR_string_data_st { const char *string; } ERR_STRING_DATA; -DECLARE_LHASH_OF(ERR_STRING_DATA); +DEFINE_LHASH_OF(ERR_STRING_DATA); void ERR_put_error(int lib, int func, int reason, const char *file, int line); void ERR_set_error_data(char *data, int flags); diff --git a/include/openssl/lhash.h b/include/openssl/lhash.h index cb89edb..b83fc6e 100644 --- a/include/openssl/lhash.h +++ b/include/openssl/lhash.h @@ -184,60 +184,60 @@ void lh_node_usage_stats_bio(const _LHASH *lh, BIO *out); # define LHASH_OF(type) struct lhash_st_##type -# define DECLARE_LHASH_OF(type) \ +# define DEFINE_LHASH_OF(type) \ LHASH_OF(type) { int dummy; }; \ - static inline LHASH_OF(type) * \ + static ossl_inline LHASH_OF(type) * \ lh_##type##_new(unsigned long (*hfn)(const type *), \ int (*cfn)(const type *, const type *)) \ { \ return (LHASH_OF(type) *) \ lh_new((LHASH_HASH_FN_TYPE) hfn, (LHASH_COMP_FN_TYPE)cfn); \ } \ - static inline void lh_##type##_free(LHASH_OF(type) *lh) \ + static ossl_inline void lh_##type##_free(LHASH_OF(type) *lh) \ { \ lh_free((_LHASH *)lh); \ } \ - static inline type *lh_##type##_insert(LHASH_OF(type) *lh, type *d) \ + static ossl_inline type *lh_##type##_insert(LHASH_OF(type) *lh, type *d) \ { \ return lh_insert((_LHASH *)lh, d); \ } \ - static inline type *lh_##type##_delete(LHASH_OF(type) *lh, const type *d) \ + static ossl_inline type *lh_##type##_delete(LHASH_OF(type) *lh, const type *d) \ { \ return lh_delete((_LHASH *)lh, d); \ } \ - static inline type *lh_##type##_retrieve(LHASH_OF(type) *lh, const type *d) \ + static ossl_inline type *lh_##type##_retrieve(LHASH_OF(type) *lh, const type *d) \ { \ return lh_retrieve((_LHASH *)lh, d); \ } \ - static inline int lh_##type##_error(LHASH_OF(type) *lh) \ + static ossl_inline int lh_##type##_error(LHASH_OF(type) *lh) \ { \ return lh_error((_LHASH *)lh); \ } \ - static inline unsigned long lh_##type##_num_items(LHASH_OF(type) *lh) \ + static ossl_inline unsigned long lh_##type##_num_items(LHASH_OF(type) *lh) \ { \ return lh_num_items((_LHASH *)lh); \ } \ - static inline void lh_##type##_node_stats_bio(const LHASH_OF(type) *lh, BIO *out) \ + static ossl_inline void lh_##type##_node_stats_bio(const LHASH_OF(type) *lh, BIO *out) \ { \ lh_node_stats_bio((_LHASH *)lh, out); \ } \ - static inline void lh_##type##_node_usage_stats_bio(const LHASH_OF(type) *lh, BIO *out) \ + static ossl_inline void lh_##type##_node_usage_stats_bio(const LHASH_OF(type) *lh, BIO *out) \ { \ lh_node_usage_stats_bio((_LHASH *)lh, out); \ } \ - static inline void lh_##type##_stats_bio(const LHASH_OF(type) *lh, BIO *out) \ + static ossl_inline void lh_##type##_stats_bio(const LHASH_OF(type) *lh, BIO *out) \ { \ lh_stats_bio((_LHASH *)lh, out); \ } \ - static inline unsigned long lh_##type##_get_down_load(LHASH_OF(type) *lh) \ + static ossl_inline unsigned long lh_##type##_get_down_load(LHASH_OF(type) *lh) \ { \ return lh_get_down_load((_LHASH *)lh); \ } \ - static inline void lh_##type##_set_down_load(LHASH_OF(type) *lh, unsigned long dl) \ + static ossl_inline void lh_##type##_set_down_load(LHASH_OF(type) *lh, unsigned long dl) \ { \ lh_set_down_load((_LHASH *)lh, dl); \ } \ - static inline void lh_##type##_doall(LHASH_OF(type) *lh, \ + static ossl_inline void lh_##type##_doall(LHASH_OF(type) *lh, \ void (*doall)(type *)) \ { \ lh_doall((_LHASH *)lh, (LHASH_DOALL_FN_TYPE)doall); \ @@ -251,7 +251,7 @@ void lh_node_usage_stats_bio(const _LHASH *lh, BIO *out); int_implement_lhash_doall(type, argtype, type) #define int_implement_lhash_doall(type, argtype, cbargtype) \ - static inline void \ + static ossl_inline void \ lh_##type##_doall_##argtype(LHASH_OF(type) *lh, \ void (*fn)(cbargtype *, argtype *), \ argtype *arg) \ @@ -267,8 +267,8 @@ void lh_node_usage_stats_bio(const _LHASH *lh, BIO *out); # define LHM_lh_doall_arg(type, lh, fn, arg_type, arg) \ lh_doall_arg(CHECKED_LHASH_OF(type, lh), fn, CHECKED_PTR_OF(arg_type, arg)) -DECLARE_LHASH_OF(OPENSSL_STRING); -DECLARE_LHASH_OF(OPENSSL_CSTRING); +DEFINE_LHASH_OF(OPENSSL_STRING); +DEFINE_LHASH_OF(OPENSSL_CSTRING); #ifdef __cplusplus } |