From 89d6aa10a24c0d5195e5a4c21f99919c53fe69ac Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Mon, 11 Jan 2016 15:22:30 +0000 Subject: [PATCH] Use ossl_inline and DEFINE_LHASH_OF Reviewed-by: Rich Salz --- apps/progs.h | 2 +- apps/progs.pl | 2 +- crypto/engine/eng_int.h | 2 +- crypto/err/err_lcl.h | 2 +- crypto/include/internal/cryptlib.h | 4 ++-- crypto/objects/obj_lcl.h | 4 ++-- include/openssl/conf.h | 2 +- include/openssl/err.h | 2 +- include/openssl/lhash.h | 34 +++++++++++++++--------------- ssl/ssl_locl.h | 2 +- 10 files changed, 28 insertions(+), 28 deletions(-) diff --git a/apps/progs.h b/apps/progs.h index 400fefcbfd..f3eaf2ac42 100644 --- a/apps/progs.h +++ b/apps/progs.h @@ -16,7 +16,7 @@ typedef struct function_st { const OPTIONS *help; } FUNCTION; -DECLARE_LHASH_OF(FUNCTION); +DEFINE_LHASH_OF(FUNCTION); extern int asn1parse_main(int argc, char *argv[]); extern int ca_main(int argc, char *argv[]); diff --git a/apps/progs.pl b/apps/progs.pl index dd935cee0d..4ffa1f1e79 100644 --- a/apps/progs.pl +++ b/apps/progs.pl @@ -20,7 +20,7 @@ typedef struct function_st { const OPTIONS *help; } FUNCTION; -DECLARE_LHASH_OF(FUNCTION); +DEFINE_LHASH_OF(FUNCTION); EOF diff --git a/crypto/engine/eng_int.h b/crypto/engine/eng_int.h index e68ef44578..7062bda889 100644 --- a/crypto/engine/eng_int.h +++ b/crypto/engine/eng_int.h @@ -218,7 +218,7 @@ struct engine_st { typedef struct st_engine_pile ENGINE_PILE; -DECLARE_LHASH_OF(ENGINE_PILE); +DEFINE_LHASH_OF(ENGINE_PILE); #ifdef __cplusplus } diff --git a/crypto/err/err_lcl.h b/crypto/err/err_lcl.h index 16404df4a4..c9d24f111e 100644 --- a/crypto/err/err_lcl.h +++ b/crypto/err/err_lcl.h @@ -1,2 +1,2 @@ -DECLARE_LHASH_OF(ERR_STATE); +DEFINE_LHASH_OF(ERR_STATE); diff --git a/crypto/include/internal/cryptlib.h b/crypto/include/internal/cryptlib.h index 041ab7ebe2..45a4d7a0e7 100644 --- a/crypto/include/internal/cryptlib.h +++ b/crypto/include/internal/cryptlib.h @@ -86,9 +86,9 @@ DEFINE_STACK_OF(EX_CALLBACK) DEFINE_STACK_OF(CRYPTO_dynlock) typedef struct app_mem_info_st APP_INFO; -DECLARE_LHASH_OF(APP_INFO); +DEFINE_LHASH_OF(APP_INFO); typedef struct mem_st MEM; -DECLARE_LHASH_OF(MEM); +DEFINE_LHASH_OF(MEM); # ifndef OPENSSL_SYS_VMS # define X509_CERT_AREA OPENSSLDIR diff --git a/crypto/objects/obj_lcl.h b/crypto/objects/obj_lcl.h index 6a8f75f09e..c451088459 100644 --- a/crypto/objects/obj_lcl.h +++ b/crypto/objects/obj_lcl.h @@ -2,6 +2,6 @@ typedef struct name_funcs_st NAME_FUNCS; DEFINE_STACK_OF(NAME_FUNCS) -DECLARE_LHASH_OF(OBJ_NAME); +DEFINE_LHASH_OF(OBJ_NAME); typedef struct added_obj_st ADDED_OBJ; -DECLARE_LHASH_OF(ADDED_OBJ); +DEFINE_LHASH_OF(ADDED_OBJ); diff --git a/include/openssl/conf.h b/include/openssl/conf.h index 118307270f..81b7b95050 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 e763731f30..df9cab2110 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 cb89edb28b..b83fc6e6f1 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 } diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h index a9d4f54ef1..a490cd3e4b 100644 --- a/ssl/ssl_locl.h +++ b/ssl/ssl_locl.h @@ -694,7 +694,7 @@ struct ssl_comp_st { }; DEFINE_STACK_OF(SSL_COMP) -DECLARE_LHASH_OF(SSL_SESSION); +DEFINE_LHASH_OF(SSL_SESSION); struct ssl_ctx_st {