mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2024-11-27 05:21:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Async clean ups

Browse Source 
Removed the function ASYNC_job_is_waiting() as it was redundant. The only
time user code has a handle on a job is when one is waiting, so all they
need to do is check whether the job is NULL. Also did some cleanups to
make sure the job really is NULL after it has been freed!

Reviewed-by: Rich Salz <rsalz@openssl.org>
This commit is contained in:
Matt Caswell 2015-03-26 10:15:59 +00:00
parent 06754949e4
commit 826760945d
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
crypto/async/async.c
View File

@ -157,6 +157,7 @@ int ASYNC_start_job(ASYNC_JOB **job, int *ret, int (*func)(void *),
*ret = ASYNC_get_ctx()->currjob->ret;
ASYNC_JOB_free(ASYNC_get_ctx()->currjob);
ASYNC_get_ctx()->currjob = NULL;
*job = NULL;
ASYNC_CTX_free();
return ASYNC_FINISH;
}
@ -180,6 +181,7 @@ int ASYNC_start_job(ASYNC_JOB **job, int *ret, int (*func)(void *),
/* Should not happen */
ASYNC_JOB_free(ASYNC_get_ctx()->currjob);
ASYNC_get_ctx()->currjob = NULL;
*job = NULL;
ASYNC_CTX_free();
return ASYNC_ERR;
}
@ -213,6 +215,7 @@ int ASYNC_start_job(ASYNC_JOB **job, int *ret, int (*func)(void *),
err:
ASYNC_JOB_free(ASYNC_get_ctx()->currjob);
ASYNC_get_ctx()->currjob = NULL;
*job = NULL;
ASYNC_CTX_free();
return ASYNC_ERR;
}
@ -244,8 +247,3 @@ int ASYNC_in_job(void)
return 0;
}
int ASYNC_job_is_waiting(ASYNC_JOB *job)
{
return job->status == ASYNC_JOB_PAUSED;
}

1
include/openssl/async.h
View File

@ -70,7 +70,6 @@ int ASYNC_start_job(ASYNC_JOB **job, int *ret, int (*func)(void *),
void *args, size_t size);
int ASYNC_pause_job(void);
int ASYNC_in_job(void);
int ASYNC_job_is_waiting(ASYNC_JOB *job);
# ifdef __cplusplus
}

6
ssl/ssl_lib.c
View File

@ -925,9 +925,9 @@ int SSL_check_private_key(const SSL *ssl)
int SSL_waiting_for_async(SSL *s)
{
if(s->job) {
return ASYNC_job_is_waiting(s->job);
}
if(s->job)
return 1;
return 0;
}