diff options
Diffstat (limited to 'crypto/objects/o_names.c')
| -rw-r--r-- | crypto/objects/o_names.c | 44 |
1 files changed, 23 insertions, 21 deletions
diff --git a/crypto/objects/o_names.c b/crypto/objects/o_names.c index 791f2b011e35..372d7c65d51f 100644 --- a/crypto/objects/o_names.c +++ b/crypto/objects/o_names.c @@ -30,9 +30,9 @@ static int names_type_num = OBJ_NAME_TYPE_NUM; static CRYPTO_RWLOCK *obj_lock = NULL; struct name_funcs_st { - unsigned long (*hash_func) (const char *name); - int (*cmp_func) (const char *a, const char *b); - void (*free_func) (const char *, int, const char *); + unsigned long (*hash_func)(const char *name); + int (*cmp_func)(const char *a, const char *b); + void (*free_func)(const char *, int, const char *); }; static STACK_OF(NAME_FUNCS) *name_funcs_stack; @@ -65,9 +65,9 @@ int OBJ_NAME_init(void) return RUN_ONCE(&init, o_names_init); } -int OBJ_NAME_new_index(unsigned long (*hash_func) (const char *), - int (*cmp_func) (const char *, const char *), - void (*free_func) (const char *, int, const char *)) +int OBJ_NAME_new_index(unsigned long (*hash_func)(const char *), + int (*cmp_func)(const char *, const char *), + void (*free_func)(const char *, int, const char *)) { int ret = 0, i, push; NAME_FUNCS *name_funcs; @@ -126,7 +126,8 @@ static int obj_name_cmp(const OBJ_NAME *a, const OBJ_NAME *b) if ((name_funcs_stack != NULL) && (sk_NAME_FUNCS_num(name_funcs_stack) > a->type)) { ret = sk_NAME_FUNCS_value(name_funcs_stack, - a->type)->cmp_func(a->name, b->name); + a->type) + ->cmp_func(a->name, b->name); } else ret = OPENSSL_strcasecmp(a->name, b->name); } @@ -139,9 +140,9 @@ static unsigned long obj_name_hash(const OBJ_NAME *a) if ((name_funcs_stack != NULL) && (sk_NAME_FUNCS_num(name_funcs_stack) > a->type)) { - ret = - sk_NAME_FUNCS_value(name_funcs_stack, - a->type)->hash_func(a->name); + ret = sk_NAME_FUNCS_value(name_funcs_stack, + a->type) + ->hash_func(a->name); } else { ret = ossl_lh_strcasehash(a->name); } @@ -221,8 +222,9 @@ int OBJ_NAME_add(const char *name, int type, const char *data) * get three arguments... -- Richard Levitte */ sk_NAME_FUNCS_value(name_funcs_stack, - ret->type)->free_func(ret->name, ret->type, - ret->data); + ret->type) + ->free_func(ret->name, ret->type, + ret->data); } OPENSSL_free(ret); } else { @@ -264,8 +266,9 @@ int OBJ_NAME_remove(const char *name, int type) * get three arguments... -- Richard Levitte */ sk_NAME_FUNCS_value(name_funcs_stack, - ret->type)->free_func(ret->name, ret->type, - ret->data); + ret->type) + ->free_func(ret->name, ret->type, + ret->data); } OPENSSL_free(ret); ok = 1; @@ -277,7 +280,7 @@ int OBJ_NAME_remove(const char *name, int type) typedef struct { int type; - void (*fn) (const OBJ_NAME *, void *arg); + void (*fn)(const OBJ_NAME *, void *arg); void *arg; } OBJ_DOALL; @@ -289,8 +292,8 @@ static void do_all_fn(const OBJ_NAME *name, OBJ_DOALL *d) IMPLEMENT_LHASH_DOALL_ARG_CONST(OBJ_NAME, OBJ_DOALL); -void OBJ_NAME_do_all(int type, void (*fn) (const OBJ_NAME *, void *arg), - void *arg) +void OBJ_NAME_do_all(int type, void (*fn)(const OBJ_NAME *, void *arg), + void *arg) { OBJ_DOALL d; @@ -326,15 +329,14 @@ static int do_all_sorted_cmp(const void *n1_, const void *n2_) } void OBJ_NAME_do_all_sorted(int type, - void (*fn) (const OBJ_NAME *, void *arg), - void *arg) + void (*fn)(const OBJ_NAME *, void *arg), + void *arg) { struct doall_sorted d; int n; d.type = type; - d.names = - OPENSSL_malloc(sizeof(*d.names) * lh_OBJ_NAME_num_items(names_lh)); + d.names = OPENSSL_malloc(sizeof(*d.names) * lh_OBJ_NAME_num_items(names_lh)); /* Really should return an error if !d.names...but its a void function! */ if (d.names != NULL) { d.n = 0; |
