generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix clang errors

Browse Source 
Make clang build without errors in the async code

Reviewed-by: Rich Salz <rsalz@openssl.org>
This commit is contained in:
Matt Caswell 2015-10-09 16:23:55 +01:00
parent 06b9ff06cc
commit d7e404c27b
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
crypto/async/arch/async_posix.c
View File

@ -65,9 +65,12 @@ __thread async_ctx *sysvctx;
#define STACKSIZE 32768 #define STACKSIZE 32768
__thread size_t pool_max_size = 0; extern __thread size_t posixpool_max_size;
__thread size_t pool_curr_size = 0; extern __thread size_t posixpool_curr_size;
__thread STACK_OF(ASYNC_JOB) *pool = NULL; extern __thread STACK_OF(ASYNC_JOB) *posixpool;
__thread size_t posixpool_max_size = 0;
__thread size_t posixpool_curr_size = 0;
__thread STACK_OF(ASYNC_JOB) *posixpool = NULL;
int async_fibre_init(async_fibre *fibre) int async_fibre_init(async_fibre *fibre)
{ {
@ -117,42 +120,43 @@ int async_read1(int fd, void *buf)
STACK_OF(ASYNC_JOB) *async_get_pool(void) STACK_OF(ASYNC_JOB) *async_get_pool(void)
{ {
return pool; return posixpool;
} }
int async_set_pool(STACK_OF(ASYNC_JOB) *poolin, size_t curr_size, int async_set_pool(STACK_OF(ASYNC_JOB) *poolin, size_t curr_size,
size_t max_size) size_t max_size)
{ {
pool = poolin; posixpool = poolin;
pool_curr_size = curr_size; posixpool_curr_size = curr_size;
pool_max_size = max_size; posixpool_max_size = max_size;
return 1; return 1;
} }
void async_increment_pool_size(void) void async_increment_pool_size(void)
{ {
pool_curr_size++; posixpool_curr_size++;
} }
void async_release_job_to_pool(ASYNC_JOB *job) void async_release_job_to_pool(ASYNC_JOB *job)
{ {
sk_ASYNC_JOB_push(pool, job); sk_ASYNC_JOB_push(posixpool, job);
} }
size_t async_pool_max_size(void) size_t async_pool_max_size(void)
{ {
return pool_max_size; return posixpool_max_size;
} }
void async_release_pool(void) void async_release_pool(void)
{ {
sk_ASYNC_JOB_free(pool); sk_ASYNC_JOB_free(posixpool);
pool = NULL; posixpool = NULL;
} }
int async_pool_can_grow(void) int async_pool_can_grow(void)
{ {
return (pool_max_size == 0) || (pool_curr_size < pool_max_size); return (posixpool_max_size == 0)
|| (posixpool_curr_size < posixpool_max_size);
} }
#endif #endif