multi-test fixes: whitespace in wolfcrypt/src/random.c and wolfcrypt/test/test.c, bugprone-macro-parentheses and -Wenum-compare in WS_RETURN_CODE() (wolfssl/ssl.h), and clang-analyzer-deadcode.DeadStores in api.c.

pull/4984/head
Daniel Pouzzner 2022-03-25 13:26:41 -05:00
parent 04e2b6c62a
commit 008c8509c6
4 changed files with 8 additions and 8 deletions

View File

@ -51361,7 +51361,7 @@ static THREAD_RETURN WOLFSSL_THREAD SSL_read_test_server_thread(void* args)
} }
/* bidirectional shutdown */ /* bidirectional shutdown */
while ((ret = wolfSSL_shutdown(ssl)) != WOLFSSL_SUCCESS) { while (wolfSSL_shutdown(ssl) != WOLFSSL_SUCCESS) {
continue; continue;
} }
@ -51433,7 +51433,7 @@ static THREAD_RETURN WOLFSSL_THREAD SSL_read_test_client_thread(void* args)
} }
} while (ret != WOLFSSL_SUCCESS && err == WC_PENDING_E); } while (ret != WOLFSSL_SUCCESS && err == WC_PENDING_E);
ret = wolfSSL_write(ssl, msg, len); AssertIntGE(wolfSSL_write(ssl, msg, len), 0);
if (0 < (idx = wolfSSL_read(ssl, input, sizeof(input)-1))) { if (0 < (idx = wolfSSL_read(ssl, input, sizeof(input)-1))) {
input[idx] = 0; input[idx] = 0;

View File

@ -786,7 +786,7 @@ enum SNICbReturn {
*/ */
#if defined(WOLFSSL_ERROR_CODE_OPENSSL) #if defined(WOLFSSL_ERROR_CODE_OPENSSL)
#define WS_RETURN_CODE(item1,item2) \ #define WS_RETURN_CODE(item1,item2) \
((item1 < 0) ? item2 : item1) (((item1) < 0) ? (int)(item2) : (int)(item1))
#else #else
#define WS_RETURN_CODE(item1,item2) (item1) #define WS_RETURN_CODE(item1,item2) (item1)
#endif #endif