make update

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

diff --git a/crypto/err/err.c b/crypto/err/err.c
index f615cb4766b9490f7b61a31947ffa21243593463..fcdb244008f66d0f8ca10e2947092307b82e2003 100644 (file)
--- a/crypto/err/err.c
+++ b/crypto/err/err.c
@@ -429,13 +429,13 @@ static ERR_STRING_DATA *int_err_del_item(ERR_STRING_DATA *d)
 
 static unsigned long err_state_hash(const ERR_STATE *a)
        {
-       return (a->pid + (unsigned long)a->pidptr) * 13;
+       return CRYPTO_THREADID_hash(&a->tid) * 13;
        }
 static IMPLEMENT_LHASH_HASH_FN(err_state, ERR_STATE)
 
 static int err_state_cmp(const ERR_STATE *a, const ERR_STATE *b)
        {
-       return (a->pid != b->pid) || (a->pidptr != b->pidptr);
+       return CRYPTO_THREADID_cmp(&a->tid, &b->tid);
        }
 static IMPLEMENT_LHASH_COMP_FN(err_state, ERR_STATE)
 
@@ -980,40 +980,37 @@ const char *ERR_reason_error_string(unsigned long e)
        return((p == NULL)?NULL:p->string);
        }
 
-void ERR_remove_state(unsigned long pid)
+void ERR_remove_thread_state(const CRYPTO_THREADID *id)
        {
        ERR_STATE tmp;
-       void *pidptr;
 
-       err_fns_check();
-       if (pid != 0)
-               pidptr = &errno;
+       if (id)
+               CRYPTO_THREADID_cpy(&tmp.tid, id);
        else
-               {
-               pid = CRYPTO_thread_id();
-               pidptr = CRYPTO_thread_idptr();
-               }
-       
-       tmp.pid=pid;
-       tmp.pidptr=pidptr;
+               CRYPTO_THREADID_current(&tmp.tid);
+       err_fns_check();
        /* thread_del_item automatically destroys the LHASH if the number of
         * items reaches zero. */
        ERRFN(thread_del_item)(&tmp);
        }
 
+#ifndef OPENSSL_NO_DEPRECATED
+void ERR_remove_state(unsigned long pid)
+       {
+       ERR_remove_thread_state(NULL);
+       }
+#endif
+
 ERR_STATE *ERR_get_state(void)
        {
        static ERR_STATE fallback;
        ERR_STATE *ret,tmp,*tmpp=NULL;
        int i;
-       unsigned long pid;
-       void *pidptr;
+       CRYPTO_THREADID tid;
 
        err_fns_check();
-       pid = CRYPTO_thread_id();
-       pidptr = CRYPTO_thread_idptr();
-       tmp.pid = pid;
-       tmp.pidptr = pidptr;
+       CRYPTO_THREADID_current(&tid);
+       CRYPTO_THREADID_cpy(&tmp.tid, &tid);
        ret=ERRFN(thread_get_item)(&tmp);
 
        /* ret == the error state, if NULL, make a new one */
@@ -1021,8 +1018,7 @@ ERR_STATE *ERR_get_state(void)
                {
                ret=(ERR_STATE *)OPENSSL_malloc(sizeof(ERR_STATE));
                if (ret == NULL) return(&fallback);
-               ret->pid=pid;
-               ret->pidptr=pidptr;
+               CRYPTO_THREADID_cpy(&ret->tid, &tid);
                ret->top=0;
                ret->bottom=0;
                for (i=0; i<ERR_NUM_ERRORS; i++)
@@ -1070,6 +1066,13 @@ void ERR_set_error_data(char *data, int flags)
 void ERR_add_error_data(int num, ...)
        {
        va_list args;
+       va_start(args, num);
+       ERR_add_error_vdata(num, args);
+       va_end(args);
+       }
+
+void ERR_add_error_vdata(int num, va_list args)
+       {
        int i,n,s;
        char *str,*p,*a;
 
@@ -1078,7 +1081,6 @@ void ERR_add_error_data(int num, ...)
        if (str == NULL) return;
        str[0]='\0';
 
-       va_start(args, num);
        n=0;
        for (i=0; i<num; i++)
                {
@@ -1094,7 +1096,7 @@ void ERR_add_error_data(int num, ...)
                                if (p == NULL)
                                        {
                                        OPENSSL_free(str);
-                                       goto err;
+                                       return;
                                        }
                                else
                                        str=p;
@@ -1103,9 +1105,6 @@ void ERR_add_error_data(int num, ...)
                        }
                }
        ERR_set_error_data(str,ERR_TXT_MALLOCED|ERR_TXT_STRING);
-
-err:
-       va_end(args);
        }
 
 int ERR_set_mark(void)