feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

ThreadX/NetX warning and optional dc_log_printf exclusion

Browse Source
This commit is contained in:
Chris Conlon
2017-06-14 11:12:27 -06:00
parent 19f22edd9a
commit ea9e4887e9
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/io.c
View File

@ -1402,6 +1402,8 @@ int NetX_Receive(WOLFSSL *ssl, char *buf, int sz, void *ctx)
ULONG copied = 0; ULONG copied = 0;
UINT status; UINT status;
(void)ssl;
if (nxCtx == NULL || nxCtx->nxSocket == NULL) { if (nxCtx == NULL || nxCtx->nxSocket == NULL) {
WOLFSSL_MSG("NetX Recv NULL parameters"); WOLFSSL_MSG("NetX Recv NULL parameters");
return WOLFSSL_CBIO_ERR_GENERAL; return WOLFSSL_CBIO_ERR_GENERAL;
@ -1455,6 +1457,8 @@ int NetX_Send(WOLFSSL* ssl, char *buf, int sz, void *ctx)
NX_PACKET_POOL* pool; /* shorthand */ NX_PACKET_POOL* pool; /* shorthand */
UINT status; UINT status;
(void)ssl;
if (nxCtx == NULL || nxCtx->nxSocket == NULL) { if (nxCtx == NULL || nxCtx->nxSocket == NULL) {
WOLFSSL_MSG("NetX Send NULL parameters"); WOLFSSL_MSG("NetX Send NULL parameters");
return WOLFSSL_CBIO_ERR_GENERAL; return WOLFSSL_CBIO_ERR_GENERAL;

4
wolfcrypt/src/logging.c
View File

@ -121,7 +121,7 @@ void wolfSSL_Debugging_OFF(void)
#include <stdio.h> /* for default printf stuff */ #include <stdio.h> /* for default printf stuff */
#endif #endif
#ifdef THREADX #if defined(THREADX) && !defined(THREADX_NO_DC_PRINTF)
int dc_log_printf(char*, ...); int dc_log_printf(char*, ...);
#endif #endif
@ -131,7 +131,7 @@ static void wolfssl_log(const int logLevel, const char *const logMessage)
log_function(logLevel, logMessage); log_function(logLevel, logMessage);
else { else {
if (loggingEnabled) { if (loggingEnabled) {
#ifdef THREADX #if defined(THREADX) && !defined(THREADX_NO_DC_PRINTF)
dc_log_printf("%s\n", logMessage); dc_log_printf("%s\n", logMessage);
#elif defined(MICRIUM) #elif defined(MICRIUM)
#if (NET_SECURE_MGR_CFG_EN == DEF_ENABLED) #if (NET_SECURE_MGR_CFG_EN == DEF_ENABLED)