Next step in tidying up the LHASH code.

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

diff --git a/crypto/err/err.c b/crypto/err/err.c
index b0ee24c3249c8ca36df076a5441c058f14f70df9..48eed688a6afb30343cfc3fde920c397aeabd7b1 100644 (file)
--- a/crypto/err/err.c
+++ b/crypto/err/err.c
@@ -123,12 +123,17 @@
 static LHASH *error_hash=NULL;
 static LHASH *thread_hash=NULL;
 
-static unsigned long err_hash(ERR_STRING_DATA *a);
-static int err_cmp(ERR_STRING_DATA *a, ERR_STRING_DATA *b);
-static unsigned long pid_hash(ERR_STATE *pid);
-static int pid_cmp(ERR_STATE *a,ERR_STATE *pid);
+/* static unsigned long err_hash(ERR_STRING_DATA *a); */
+static unsigned long err_hash(void *a_void);
+/* static int err_cmp(ERR_STRING_DATA *a, ERR_STRING_DATA *b); */
+static int err_cmp(void *a_void, void *b_void);
+/* static unsigned long pid_hash(ERR_STATE *pid); */
+static unsigned long pid_hash(void *pid_void);
+/* static int pid_cmp(ERR_STATE *a,ERR_STATE *pid); */
+static int pid_cmp(void *a_void,void *pid_void);
 static unsigned long get_error_values(int inc,const char **file,int *line,
                                      const char **data,int *flags);
+
 static void ERR_STATE_free(ERR_STATE *s);
 #ifndef NO_ERR
 static ERR_STRING_DATA ERR_str_libraries[]=
@@ -157,6 +162,7 @@ static ERR_STRING_DATA ERR_str_libraries[]=
 {ERR_PACK(ERR_LIB_PKCS12,0,0)          ,"PKCS12 routines"},
 {ERR_PACK(ERR_LIB_RAND,0,0)            ,"random number generator"},
 {ERR_PACK(ERR_LIB_DSO,0,0)             ,"DSO support routines"},
+{ERR_PACK(ERR_LIB_ENGINE,0,0)          ,"engine routines"},
 {0,NULL},
        };
 
@@ -208,6 +214,7 @@ static ERR_STRING_DATA ERR_str_reasons[]=
 {ERR_R_ASN1_LENGTH_MISMATCH            ,"asn1 length mismatch"},
 {ERR_R_MISSING_ASN1_EOS                        ,"missing asn1 eos"},
 {ERR_R_DSO_LIB                         ,"DSO lib"},
+{ERR_R_ENGINE_LIB                      ,"ENGINE lib"},
 
 {0,NULL},
        };
@@ -228,7 +235,7 @@ static ERR_STRING_DATA SYS_str_reasons[NUM_SYS_STR_REASONS + 1];
 
 static void build_SYS_str_reasons()
        {
-       /* Malloc cannot be used here, use static storage instead */
+       /* OPENSSL_malloc cannot be used here, use static storage instead */
        static char strerror_tab[NUM_SYS_STR_REASONS][LEN_SYS_STR_REASON];
        int i;
 
@@ -265,7 +272,7 @@ static void build_SYS_str_reasons()
        if (((p)->err_data[i] != NULL) && \
                (p)->err_data_flags[i] & ERR_TXT_MALLOCED) \
                {  \
-               Free((p)->err_data[i]); \
+               OPENSSL_free((p)->err_data[i]); \
                (p)->err_data[i]=NULL; \
                } \
        (p)->err_data_flags[i]=0;
@@ -281,7 +288,7 @@ static void ERR_STATE_free(ERR_STATE *s)
                {
                err_clear_data(s,i);
                }
-       Free(s);
+       OPENSSL_free(s);
        }
 
 void ERR_load_ERR_strings(void)
@@ -314,7 +321,7 @@ void ERR_load_strings(int lib, ERR_STRING_DATA *str)
        if (error_hash == NULL)
                {
                CRYPTO_w_lock(CRYPTO_LOCK_ERR_HASH);
-               error_hash=lh_new(err_hash,err_cmp);
+               error_hash=lh_new(err_hash, err_cmp);
                if (error_hash == NULL)
                        {
                        CRYPTO_w_unlock(CRYPTO_LOCK_ERR_HASH);
@@ -535,7 +542,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 +565,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 +573,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 +586,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 +594,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 +607,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,38 +620,44 @@ 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);
        }
 
-static unsigned long err_hash(ERR_STRING_DATA *a)
+/* static unsigned long err_hash(ERR_STRING_DATA *a) */
+static unsigned long err_hash(void *a_void)
        {
        unsigned long ret,l;
 
-       l=a->error;
+       l=((ERR_STRING_DATA *)a_void)->error;
        ret=l^ERR_GET_LIB(l)^ERR_GET_FUNC(l);
        return(ret^ret%19*13);
        }
 
-static int err_cmp(ERR_STRING_DATA *a, ERR_STRING_DATA *b)
+/* static int err_cmp(ERR_STRING_DATA *a, ERR_STRING_DATA *b) */
+static int err_cmp(void *a_void, void *b_void)
        {
-       return((int)(a->error-b->error));
+       return((int)(((ERR_STRING_DATA *)a_void)->error -
+                       ((ERR_STRING_DATA *)b_void)->error));
        }
 
-static unsigned long pid_hash(ERR_STATE *a)
+/* static unsigned long pid_hash(ERR_STATE *a) */
+static unsigned long pid_hash(void *a_void)
        {
-       return(a->pid*13);
+       return(((ERR_STATE *)a_void)->pid*13);
        }
 
-static int pid_cmp(ERR_STATE *a, ERR_STATE *b)
+/* static int pid_cmp(ERR_STATE *a, ERR_STATE *b) */
+static int pid_cmp(void *a_void, void *b_void)
        {
-       return((int)((long)a->pid - (long)b->pid));
+       return((int)((long)((ERR_STATE *)a_void)->pid -
+                       (long)((ERR_STATE *)b_void)->pid));
        }
 
 void ERR_remove_state(unsigned long pid)
        {
-       ERR_STATE *p,tmp;
+       ERR_STATE *p = NULL,tmp;
 
        if (thread_hash == NULL)
                return;
@@ -652,12 +665,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,18 +690,18 @@ 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)
                {
-               ret=(ERR_STATE *)Malloc(sizeof(ERR_STATE));
+               ret=(ERR_STATE *)OPENSSL_malloc(sizeof(ERR_STATE));
                if (ret == NULL) return(&fallback);
                ret->pid=pid;
                ret->top=0;
@@ -755,7 +771,7 @@ void ERR_add_error_data(int num, ...)
        char *str,*p,*a;
 
        s=64;
-       str=Malloc(s+1);
+       str=OPENSSL_malloc(s+1);
        if (str == NULL) return;
        str[0]='\0';
 
@@ -771,10 +787,10 @@ void ERR_add_error_data(int num, ...)
                        if (n > s)
                                {
                                s=n+20;
-                               p=Realloc(str,s+1);
+                               p=OPENSSL_realloc(str,s+1);
                                if (p == NULL)
                                        {
-                                       Free(str);
+                                       OPENSSL_free(str);
                                        return;
                                        }
                                else