diff options
Diffstat (limited to 'crypto/err/err.c')
| -rw-r--r-- | crypto/err/err.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/crypto/err/err.c b/crypto/err/err.c index 8baa53c40d..9b4eb612ed 100644 --- a/crypto/err/err.c +++ b/crypto/err/err.c @@ -222,7 +222,7 @@ void ERR_load_strings(int lib, ERR_STRING_DATA *str) while (str->error) { str->error|=ERR_PACK(lib,0,0); - lh_insert(error_hash,(char *)str); + lh_insert(error_hash,str); str++; } CRYPTO_w_unlock(CRYPTO_LOCK_ERR_HASH); @@ -428,7 +428,7 @@ const char *ERR_lib_error_string(unsigned long e) if (error_hash != NULL) { d.error=ERR_PACK(l,0,0); - p=(ERR_STRING_DATA *)lh_retrieve(error_hash,(char *)&d); + p=(ERR_STRING_DATA *)lh_retrieve(error_hash,&d); } CRYPTO_r_unlock(CRYPTO_LOCK_ERR_HASH); @@ -449,7 +449,7 @@ const char *ERR_func_error_string(unsigned long e) if (error_hash != NULL) { d.error=ERR_PACK(l,f,0); - p=(ERR_STRING_DATA *)lh_retrieve(error_hash,(char *)&d); + p=(ERR_STRING_DATA *)lh_retrieve(error_hash,&d); } CRYPTO_r_unlock(CRYPTO_LOCK_ERR_HASH); @@ -470,12 +470,11 @@ const char *ERR_reason_error_string(unsigned long e) if (error_hash != NULL) { d.error=ERR_PACK(l,0,r); - p=(ERR_STRING_DATA *)lh_retrieve(error_hash,(char *)&d); + p=(ERR_STRING_DATA *)lh_retrieve(error_hash,&d); if (p == NULL) { d.error=ERR_PACK(0,0,r); - p=(ERR_STRING_DATA *)lh_retrieve(error_hash, - (char *)&d); + p=(ERR_STRING_DATA *)lh_retrieve(error_hash,&d); } } @@ -518,7 +517,7 @@ void ERR_remove_state(unsigned long pid) pid=(unsigned long)CRYPTO_thread_id(); tmp.pid=pid; CRYPTO_w_lock(CRYPTO_LOCK_ERR); - p=(ERR_STATE *)lh_delete(thread_hash,(char *)&tmp); + p=(ERR_STATE *)lh_delete(thread_hash,&tmp); CRYPTO_w_unlock(CRYPTO_LOCK_ERR); if (p != NULL) ERR_STATE_free(p); @@ -552,7 +551,7 @@ ERR_STATE *ERR_get_state(void) else { tmp.pid=pid; - ret=(ERR_STATE *)lh_retrieve(thread_hash,(char *)&tmp); + ret=(ERR_STATE *)lh_retrieve(thread_hash,&tmp); CRYPTO_r_unlock(CRYPTO_LOCK_ERR); } @@ -570,7 +569,7 @@ ERR_STATE *ERR_get_state(void) ret->err_data_flags[i]=0; } CRYPTO_w_lock(CRYPTO_LOCK_ERR); - tmpp=(ERR_STATE *)lh_insert(thread_hash,(char *)ret); + tmpp=(ERR_STATE *)lh_insert(thread_hash,ret); CRYPTO_w_unlock(CRYPTO_LOCK_ERR); if (tmpp != NULL) /* old entry - should not happen */ { |