diff options
| author | Ulf Möller <ulf@openssl.org> | 2000-01-30 22:20:28 +0000 |
|---|---|---|
| committer | Ulf Möller <ulf@openssl.org> | 2000-01-30 22:20:28 +0000 |
| commit | 9d1a01be8f84143618fc862e1222eb714949fdc1 (patch) | |
| tree | ba9639648f25c2d5104368d7e96e8b391e100cc7 /crypto/conf | |
| parent | 74235cc9ec3123ee7f51211ea054632ca0cf7c91 (diff) | |
| download | openssl-9d1a01be8f84143618fc862e1222eb714949fdc1.tar.gz | |
Source code cleanups: Use void * rather than char * in lhash,
eliminate some of the -Wcast-qual warnings (debug-ben-strict target)
Diffstat (limited to 'crypto/conf')
| -rw-r--r-- | crypto/conf/conf.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/crypto/conf/conf.c b/crypto/conf/conf.c index 13db218a29..3031fa3b44 100644 --- a/crypto/conf/conf.c +++ b/crypto/conf/conf.c @@ -336,7 +336,7 @@ again: ERR_R_MALLOC_FAILURE); goto err; } - vv=(CONF_VALUE *)lh_insert(ret,(char *)v); + vv=(CONF_VALUE *)lh_insert(ret,v); if (vv != NULL) { sk_CONF_VALUE_delete_ptr(ts,vv); @@ -378,7 +378,7 @@ char *CONF_get_string(LHASH *conf, char *section, char *name) { vv.name=name; vv.section=section; - v=(CONF_VALUE *)lh_retrieve(conf,(char *)&vv); + v=(CONF_VALUE *)lh_retrieve(conf,&vv); if (v != NULL) return(v->value); if (strcmp(section,"ENV") == 0) { @@ -388,7 +388,7 @@ char *CONF_get_string(LHASH *conf, char *section, char *name) } vv.section="default"; vv.name=name; - v=(CONF_VALUE *)lh_retrieve(conf,(char *)&vv); + v=(CONF_VALUE *)lh_retrieve(conf,&vv); if (v != NULL) return(v->value); else @@ -405,7 +405,7 @@ static CONF_VALUE *get_section(LHASH *conf, char *section) if ((conf == NULL) || (section == NULL)) return(NULL); vv.name=NULL; vv.section=section; - v=(CONF_VALUE *)lh_retrieve(conf,(char *)&vv); + v=(CONF_VALUE *)lh_retrieve(conf,&vv); return(v); } @@ -443,12 +443,12 @@ void CONF_free(LHASH *conf) conf->down_load=0; /* evil thing to make sure the 'Free()' * works as expected */ - lh_doall_arg(conf,(void (*)())value_free_hash,(char *)conf); + lh_doall_arg(conf,(void (*)())value_free_hash,conf); /* We now have only 'section' entries in the hash table. * Due to problems with */ - lh_doall_arg(conf,(void (*)())value_free_stack,(char *)conf); + lh_doall_arg(conf,(void (*)())value_free_stack,conf); lh_free(conf); } @@ -456,7 +456,7 @@ static void value_free_hash(CONF_VALUE *a, LHASH *conf) { if (a->name != NULL) { - a=(CONF_VALUE *)lh_delete(conf,(char *)a); + a=(CONF_VALUE *)lh_delete(conf,a); } } @@ -708,7 +708,7 @@ static CONF_VALUE *new_section(LHASH *conf, char *section) v->name=NULL; v->value=(char *)sk; - vv=(CONF_VALUE *)lh_insert(conf,(char *)v); + vv=(CONF_VALUE *)lh_insert(conf,v); if (vv != NULL) { #if !defined(NO_STDIO) && !defined(WIN16) |