generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use ossl_inline and DEFINE_LHASH_OF

Browse Source 
Reviewed-by: Rich Salz <rsalz@openssl.org>
This commit is contained in:
Dr. Stephen Henson
2016-01-11 15:22:30 +00:00
parent 26a884c217
commit 89d6aa10a2
10 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/progs.h
View File

@@ -16,7 +16,7 @@ typedef struct function_st {
const OPTIONS *help; const OPTIONS *help;
} FUNCTION; } FUNCTION;
DECLARE_LHASH_OF(FUNCTION); DEFINE_LHASH_OF(FUNCTION);
extern int asn1parse_main(int argc, char *argv[]); extern int asn1parse_main(int argc, char *argv[]);
extern int ca_main(int argc, char *argv[]); extern int ca_main(int argc, char *argv[]);

2
apps/progs.pl
View File

@@ -20,7 +20,7 @@ typedef struct function_st {
const OPTIONS *help; const OPTIONS *help;
} FUNCTION; } FUNCTION;
DECLARE_LHASH_OF(FUNCTION); DEFINE_LHASH_OF(FUNCTION);
EOF EOF

2
crypto/engine/eng_int.h
View File

@@ -218,7 +218,7 @@ struct engine_st {
typedef struct st_engine_pile ENGINE_PILE; typedef struct st_engine_pile ENGINE_PILE;
DECLARE_LHASH_OF(ENGINE_PILE); DEFINE_LHASH_OF(ENGINE_PILE);
#ifdef __cplusplus #ifdef __cplusplus
} }

2
crypto/err/err_lcl.h
View File

@@ -1,2 +1,2 @@
DECLARE_LHASH_OF(ERR_STATE); DEFINE_LHASH_OF(ERR_STATE);

4
crypto/include/internal/cryptlib.h
View File

@@ -86,9 +86,9 @@ DEFINE_STACK_OF(EX_CALLBACK)
DEFINE_STACK_OF(CRYPTO_dynlock) DEFINE_STACK_OF(CRYPTO_dynlock)
typedef struct app_mem_info_st APP_INFO; typedef struct app_mem_info_st APP_INFO;
DECLARE_LHASH_OF(APP_INFO); DEFINE_LHASH_OF(APP_INFO);
typedef struct mem_st MEM; typedef struct mem_st MEM;
DECLARE_LHASH_OF(MEM); DEFINE_LHASH_OF(MEM);
# ifndef OPENSSL_SYS_VMS # ifndef OPENSSL_SYS_VMS
# define X509_CERT_AREA OPENSSLDIR # define X509_CERT_AREA OPENSSLDIR

4
crypto/objects/obj_lcl.h
View File

@@ -2,6 +2,6 @@
typedef struct name_funcs_st NAME_FUNCS; typedef struct name_funcs_st NAME_FUNCS;
DEFINE_STACK_OF(NAME_FUNCS) DEFINE_STACK_OF(NAME_FUNCS)
DECLARE_LHASH_OF(OBJ_NAME); DEFINE_LHASH_OF(OBJ_NAME);
typedef struct added_obj_st ADDED_OBJ; typedef struct added_obj_st ADDED_OBJ;
DECLARE_LHASH_OF(ADDED_OBJ); DEFINE_LHASH_OF(ADDED_OBJ);

2
include/openssl/conf.h
View File

@@ -78,7 +78,7 @@ typedef struct {
} CONF_VALUE; } CONF_VALUE;
DEFINE_STACK_OF(CONF_VALUE) DEFINE_STACK_OF(CONF_VALUE)
DECLARE_LHASH_OF(CONF_VALUE); DEFINE_LHASH_OF(CONF_VALUE);
struct conf_st; struct conf_st;
struct conf_method_st; struct conf_method_st;

2
include/openssl/err.h
View File

@@ -315,7 +315,7 @@ typedef struct ERR_string_data_st {
const char *string; const char *string;
} ERR_STRING_DATA; } 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_put_error(int lib, int func, int reason, const char *file, int line);
void ERR_set_error_data(char *data, int flags); void ERR_set_error_data(char *data, int flags);

34
include/openssl/lhash.h
View File

@@ -184,60 +184,60 @@ void lh_node_usage_stats_bio(const _LHASH *lh, BIO *out);
# define LHASH_OF(type) struct lhash_st_##type # define LHASH_OF(type) struct lhash_st_##type
# define DECLARE_LHASH_OF(type) \ # define DEFINE_LHASH_OF(type) \
LHASH_OF(type) { int dummy; }; \ LHASH_OF(type) { int dummy; }; \
static inline LHASH_OF(type) * \ static ossl_inline LHASH_OF(type) * \
lh_##type##_new(unsigned long (*hfn)(const type *), \ lh_##type##_new(unsigned long (*hfn)(const type *), \
int (*cfn)(const type *, const type *)) \ int (*cfn)(const type *, const type *)) \
{ \ { \
return (LHASH_OF(type) *) \ return (LHASH_OF(type) *) \
lh_new((LHASH_HASH_FN_TYPE) hfn, (LHASH_COMP_FN_TYPE)cfn); \ 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); \ 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); \ 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); \ 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); \ 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); \ 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); \ 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); \ 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); \ 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); \ 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); \ 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); \ 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 *)) \ void (*doall)(type *)) \
{ \ { \
lh_doall((_LHASH *)lh, (LHASH_DOALL_FN_TYPE)doall); \ 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) int_implement_lhash_doall(type, argtype, type)
#define int_implement_lhash_doall(type, argtype, cbargtype) \ #define int_implement_lhash_doall(type, argtype, cbargtype) \
static inline void \ static ossl_inline void \
lh_##type##_doall_##argtype(LHASH_OF(type) *lh, \ lh_##type##_doall_##argtype(LHASH_OF(type) *lh, \
void (*fn)(cbargtype *, argtype *), \ void (*fn)(cbargtype *, argtype *), \
argtype *arg) \ 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) \ # 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)) lh_doall_arg(CHECKED_LHASH_OF(type, lh), fn, CHECKED_PTR_OF(arg_type, arg))
DECLARE_LHASH_OF(OPENSSL_STRING); DEFINE_LHASH_OF(OPENSSL_STRING);
DECLARE_LHASH_OF(OPENSSL_CSTRING); DEFINE_LHASH_OF(OPENSSL_CSTRING);
#ifdef __cplusplus #ifdef __cplusplus
} }

2
ssl/ssl_locl.h
View File

@@ -694,7 +694,7 @@ struct ssl_comp_st {
}; };
DEFINE_STACK_OF(SSL_COMP) DEFINE_STACK_OF(SSL_COMP)
DECLARE_LHASH_OF(SSL_SESSION); DEFINE_LHASH_OF(SSL_SESSION);
struct ssl_ctx_st { struct ssl_ctx_st {