diff options
| author | Geoff Thorpe <geoff@openssl.org> | 2001-02-20 16:31:15 +0000 |
|---|---|---|
| committer | Geoff Thorpe <geoff@openssl.org> | 2001-02-20 16:31:15 +0000 |
| commit | 4dc719fc37cb2201c8e211c6a684d71477c20f50 (patch) | |
| tree | 86f32bd6f0c5f0b3ccaf7e731a2cd098440426dc /crypto/objects | |
| parent | 48f2ef8d004f1fa043238bd87b5976c53d278b80 (diff) | |
| download | openssl-4dc719fc37cb2201c8e211c6a684d71477c20f50.tar.gz | |
The callbacks in the NAME_FUNCS structure are not used directly as LHASH
callbacks, and their prototypes were consistent as they were. These casts
need reversing.
Also, I personally find line breaks during parameter lists (ie a line
ending in a comma) easier to read at a glance than line breaks at the end
of a function call and before a dereference on the return value (ie a line
ending in a closed-bracket followed by a line starting with "->").
Diffstat (limited to 'crypto/objects')
| -rw-r--r-- | crypto/objects/o_names.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/crypto/objects/o_names.c b/crypto/objects/o_names.c index f381b395d0..5e70508d9a 100644 --- a/crypto/objects/o_names.c +++ b/crypto/objects/o_names.c @@ -67,8 +67,8 @@ int OBJ_NAME_new_index(unsigned long (*hash_func)(const char *), { MemCheck_off(); name_funcs = OPENSSL_malloc(sizeof(NAME_FUNCS)); - name_funcs->hash_func = (LHASH_HASH_FN_TYPE)lh_strhash; - name_funcs->cmp_func = (LHASH_COMP_FN_TYPE)strcmp; + name_funcs->hash_func = lh_strhash; + name_funcs->cmp_func = strcmp; name_funcs->free_func = 0; /* NULL is often declared to * ((void *)0), which according * to Compaq C is not really @@ -100,8 +100,8 @@ static int obj_name_cmp(const void *a_void, const void *b_void) 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); + ret=sk_NAME_FUNCS_value(name_funcs_stack, + a->type)->cmp_func(a->name,b->name); } else ret=strcmp(a->name,b->name); @@ -117,8 +117,8 @@ static unsigned long obj_name_hash(const void *a_void) 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 { @@ -190,8 +190,8 @@ int OBJ_NAME_add(const char *name, int type, const char *data) * function should get three arguments... * -- Richard Levitte */ - sk_NAME_FUNCS_value(name_funcs_stack,ret->type) - ->free_func(ret->name,ret->type,ret->data); + sk_NAME_FUNCS_value(name_funcs_stack, + ret->type)->free_func(ret->name,ret->type,ret->data); } OPENSSL_free(ret); } @@ -225,8 +225,8 @@ int OBJ_NAME_remove(const char *name, int type) * function should get three arguments... * -- Richard Levitte */ - sk_NAME_FUNCS_value(name_funcs_stack,ret->type) - ->free_func(ret->name,ret->type,ret->data); + sk_NAME_FUNCS_value(name_funcs_stack, + ret->type)->free_func(ret->name,ret->type,ret->data); } OPENSSL_free(ret); return(1); |