Another superfluous pair of parentheses.

[openssl.git] / crypto / err / err.c

diff --git a/crypto/err/err.c b/crypto/err/err.c
index 9557761f41458018e5d83d30c0beecdce2352ec9..bfecb86c754b65b23cfd8fe98337cdd68700217a 100644 (file)
--- a/crypto/err/err.c
+++ b/crypto/err/err.c
@@ -535,7 +535,7 @@ char *ERR_error_string(unsigned long e, char *ret)
        static char buf[256];
 
        if (ret == NULL) ret=buf;
-       ERR_error_string_n(e, buf, 256);
+       ERR_error_string_n(e, ret, 256);
 
        return(ret);
        }
@@ -558,7 +558,7 @@ const char *ERR_lib_error_string(unsigned long e)
 
        l=ERR_GET_LIB(e);
 
-       CRYPTO_r_lock(CRYPTO_LOCK_ERR_HASH);
+       CRYPTO_w_lock(CRYPTO_LOCK_ERR_HASH);
 
        if (error_hash != NULL)
                {
@@ -566,7 +566,7 @@ const char *ERR_lib_error_string(unsigned long e)
                p=(ERR_STRING_DATA *)lh_retrieve(error_hash,&d);
                }
 
-       CRYPTO_r_unlock(CRYPTO_LOCK_ERR_HASH);
+       CRYPTO_w_unlock(CRYPTO_LOCK_ERR_HASH);
 
        return((p == NULL)?NULL:p->string);
        }
@@ -579,7 +579,7 @@ const char *ERR_func_error_string(unsigned long e)
        l=ERR_GET_LIB(e);
        f=ERR_GET_FUNC(e);
 
-       CRYPTO_r_lock(CRYPTO_LOCK_ERR_HASH);
+       CRYPTO_w_lock(CRYPTO_LOCK_ERR_HASH);
 
        if (error_hash != NULL)
                {
@@ -587,7 +587,7 @@ const char *ERR_func_error_string(unsigned long e)
                p=(ERR_STRING_DATA *)lh_retrieve(error_hash,&d);
                }
 
-       CRYPTO_r_unlock(CRYPTO_LOCK_ERR_HASH);
+       CRYPTO_w_unlock(CRYPTO_LOCK_ERR_HASH);
 
        return((p == NULL)?NULL:p->string);
        }
@@ -600,7 +600,7 @@ const char *ERR_reason_error_string(unsigned long e)
        l=ERR_GET_LIB(e);
        r=ERR_GET_REASON(e);
 
-       CRYPTO_r_lock(CRYPTO_LOCK_ERR_HASH);
+       CRYPTO_w_lock(CRYPTO_LOCK_ERR_HASH);
 
        if (error_hash != NULL)
                {
@@ -613,7 +613,7 @@ const char *ERR_reason_error_string(unsigned long e)
                        }
                }
 
-       CRYPTO_r_unlock(CRYPTO_LOCK_ERR_HASH);
+       CRYPTO_w_unlock(CRYPTO_LOCK_ERR_HASH);
 
        return((p == NULL)?NULL:p->string);
        }
@@ -644,7 +644,7 @@ static int pid_cmp(ERR_STATE *a, ERR_STATE *b)
 
 void ERR_remove_state(unsigned long pid)
        {
-       ERR_STATE *p,tmp;
+       ERR_STATE *p = NULL,tmp;
 
        if (thread_hash == NULL)
                return;
@@ -652,12 +652,15 @@ 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,&tmp);
-       if (lh_num_items(thread_hash) == 0)
+       if (thread_hash)
                {
-               /* make sure we don't leak memory */
-               lh_free(thread_hash);
-               thread_hash = NULL;
+               p=(ERR_STATE *)lh_delete(thread_hash,&tmp);
+               if (lh_num_items(thread_hash) == 0)
+                       {
+                       /* make sure we don't leak memory */
+                       lh_free(thread_hash);
+                       thread_hash = NULL;
+                       }
                }
        CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
 
@@ -674,13 +677,13 @@ ERR_STATE *ERR_get_state(void)
 
        pid=(unsigned long)CRYPTO_thread_id();
 
-       CRYPTO_r_lock(CRYPTO_LOCK_ERR);
+       CRYPTO_w_lock(CRYPTO_LOCK_ERR);
        if (thread_hash != NULL)
                {
                tmp.pid=pid;
                ret=(ERR_STATE *)lh_retrieve(thread_hash,&tmp);
                }
-       CRYPTO_r_unlock(CRYPTO_LOCK_ERR);
+       CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
 
        /* ret == the error state, if NULL, make a new one */
        if (ret == NULL)