diff options
| author | FdaSilvaYY <fdasilvayy@gmail.com> | 2016-07-28 21:15:52 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-08-02 09:59:23 +0200 |
| commit | 700b814549c8c158c82466116cfc545b00f647c3 (patch) | |
| tree | 26d0879de134e62852d75a0bb41535c2a80a99eb /apps | |
| parent | cb926df2fa42bd1e396a600ff6212ee4f4e04118 (diff) | |
Fix some style issues...
extra spacing and 80 cols
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1366)
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/progs.h | 2 | ||||
| -rw-r--r-- | apps/speed.c | 26 |
2 files changed, 14 insertions, 14 deletions
diff --git a/apps/progs.h b/apps/progs.h index ac9d20804b..5f6f07f89d 100644 --- a/apps/progs.h +++ b/apps/progs.h @@ -18,7 +18,7 @@ typedef enum FUNC_TYPE { typedef struct function_st { FUNC_TYPE type; const char *name; - int (*func)(int argc,char *argv[]); + int (*func)(int argc, char *argv[]); const OPTIONS *help; } FUNCTION; diff --git a/apps/speed.c b/apps/speed.c index 6a62ab79e3..e04a440bbe 100644 --- a/apps/speed.c +++ b/apps/speed.c @@ -371,7 +371,7 @@ OPTIONS speed_options[] = { {"decrypt", OPT_DECRYPT, '-', "Time decryption instead of encryption (only EVP)"}, {"mr", OPT_MR, '-', "Produce machine readable output"}, - {"mb", OPT_MB, '-', + {"mb", OPT_MB, '-', "Enable (tls1.1) multi-block mode on evp_cipher requested with -evp"}, {"misalign", OPT_MISALIGN, 'n', "Amount to mis-align buffers"}, {"elapsed", OPT_ELAPSED, '-', @@ -1066,16 +1066,16 @@ static void *KDF1_SHA1(const void *in, size_t inlen, void *out, *outlen = SHA_DIGEST_LENGTH; return SHA1(in, inlen, out); } - #endif /* ndef OPENSSL_NO_EC */ -static int run_benchmark(int async_jobs, int (*loop_function)(void *), loopargs_t *loopargs) +static int run_benchmark(int async_jobs, + int (*loop_function)(void *), loopargs_t *loopargs) { int job_op_count = 0; int total_op_count = 0; int num_inprogress = 0; - int error = 0, i = 0, async = 0; + int error = 0, i = 0, ret = 0; OSSL_ASYNC_FD job_fd = 0; size_t num_job_fds = 0; @@ -1086,10 +1086,10 @@ static int run_benchmark(int async_jobs, int (*loop_function)(void *), loopargs_ } for (i = 0; i < async_jobs && !error; i++) { - async = ASYNC_start_job(&(loopargs[i].inprogress_job), loopargs[i].wait_ctx, - &job_op_count, loop_function, - (void *)(loopargs + i), sizeof(loopargs_t)); - switch (async) { + ret = ASYNC_start_job(&loopargs[i].inprogress_job, loopargs[i].wait_ctx, + &job_op_count, loop_function, + (void *)(loopargs + i), sizeof(loopargs_t)); + switch (ret) { case ASYNC_PAUSE: ++num_inprogress; break; @@ -1179,15 +1179,15 @@ static int run_benchmark(int async_jobs, int (*loop_function)(void *), loopargs_ continue; #elif defined(OPENSSL_SYS_WINDOWS) if (num_job_fds == 1 - && !PeekNamedPipe(job_fd, NULL, 0, NULL, &avail, NULL) + && !PeekNamedPipe(job_fd, NULL, 0, NULL, &avail, NULL) && avail > 0) continue; #endif - async = ASYNC_start_job(&(loopargs[i].inprogress_job), loopargs[i].wait_ctx, - &job_op_count, loop_function, (void *)(loopargs + i), - sizeof(loopargs_t)); - switch (async) { + ret = ASYNC_start_job(&loopargs[i].inprogress_job, + loopargs[i].wait_ctx, &job_op_count, loop_function, + (void *)(loopargs + i), sizeof(loopargs_t)); + switch (ret) { case ASYNC_PAUSE: break; case ASYNC_FINISH: |