Remove ASYNC_in_job()

The ASYNC_in_job() function is redundant. The same effect can be achieved by
using ASYNC_get_current_job().

Reviewed-by: Rich Salz <rsalz@openssl.org>

diff --git a/crypto/async/async.c b/crypto/async/async.c
index ed3ed739ea08d5d857c0c580e9722ff6aff2cfa6..7a4fbf51337e5b6450c168a96d495e64efd9e9a3 100644 (file)
--- a/crypto/async/async.c
+++ b/crypto/async/async.c
@@ -287,14 +287,6 @@ int ASYNC_pause_job(void)
     return 1;
 }
 
     return 1;
 }
 

-int ASYNC_in_job(void)
-{
-    if(ASYNC_get_ctx())
-        return 1;
-
-    return 0;
-}
-

 static void async_empty_pool(STACK_OF(ASYNC_JOB) *pool)
 {
     ASYNC_JOB *job;
 static void async_empty_pool(STACK_OF(ASYNC_JOB) *pool)
 {
     ASYNC_JOB *job;

diff --git a/include/openssl/async.h b/include/openssl/async.h
index 5b84d5babbdf09ee374ff46968c803e5d0c12161..e123261e6bd91441c6706a061ed7d3e1a9f72161 100644 (file)
--- a/include/openssl/async.h
+++ b/include/openssl/async.h
@@ -73,7 +73,6 @@ void ASYNC_free_pool(void);
 int ASYNC_start_job(ASYNC_JOB **job, int *ret, int (*func)(void *),
                          void *args, size_t size);
 int ASYNC_pause_job(void);
 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_get_wait_fd(ASYNC_JOB *job);
 ASYNC_JOB *ASYNC_get_current_job(void);
 
 int ASYNC_get_wait_fd(ASYNC_JOB *job);
 ASYNC_JOB *ASYNC_get_current_job(void);

diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index 270a908a3ec4e63e8758922d6d8e3d8fe3677bb3..55b64bbcb10adf5ee6b38d6ec4eb104c15b391f9 100644 (file)
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -961,7 +961,7 @@ int SSL_accept(SSL *s)
 
     args.s = s;
 
 
     args.s = s;
 

-    if((s->mode & SSL_MODE_ASYNC) && !ASYNC_in_job()) {
+    if((s->mode & SSL_MODE_ASYNC) && ASYNC_get_current_job() == NULL) {

         switch(ASYNC_start_job(&s->job, &ret, ssl_accept_intern, &args,
             sizeof(struct ssl_async_args))) {
         case ASYNC_ERR:
         switch(ASYNC_start_job(&s->job, &ret, ssl_accept_intern, &args,
             sizeof(struct ssl_async_args))) {
         case ASYNC_ERR:


@@ -1031,7 +1031,7 @@ int SSL_read(SSL *s, void *buf, int num)
     args.buf = buf;
     args.num = num;
 
     args.buf = buf;
     args.num = num;
 

-    if((s->mode & SSL_MODE_ASYNC) && !ASYNC_in_job()) {
+    if((s->mode & SSL_MODE_ASYNC) && ASYNC_get_current_job() == NULL) {

         switch(ASYNC_start_job(&s->job, &ret, ssl_read_intern, &args,
             sizeof(struct ssl_async_args))) {
         case ASYNC_ERR:
         switch(ASYNC_start_job(&s->job, &ret, ssl_read_intern, &args,
             sizeof(struct ssl_async_args))) {
         case ASYNC_ERR:


@@ -1104,7 +1104,7 @@ int SSL_write(SSL *s, const void *buf, int num)
     args.buf = (void *) buf;
     args.num = num;
 
     args.buf = (void *) buf;
     args.num = num;
 

-    if((s->mode & SSL_MODE_ASYNC) && !ASYNC_in_job()) {
+    if((s->mode & SSL_MODE_ASYNC) && ASYNC_get_current_job() == NULL) {

         switch(ASYNC_start_job(&s->job, &ret, ssl_write_intern, &args,
             sizeof(struct ssl_async_args))) {
         case ASYNC_ERR:
         switch(ASYNC_start_job(&s->job, &ret, ssl_write_intern, &args,
             sizeof(struct ssl_async_args))) {
         case ASYNC_ERR: