wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2026-01-26 14:12:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

replace (f)printf with WOLFSSL_DEBUG_PRINTF

Browse Source
This commit is contained in:
effbiae
2025-08-29 12:32:26 +10:00
parent 0224ef3d2e
commit 44c403f4c7
3 changed files with 20 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
wolfcrypt/src/logging.c
View File

@@ -253,7 +253,8 @@ void WOLFSSL_START(int funcNum)
if (funcNum < WC_FUNC_COUNT) {
double now = current_time(0) * 1000.0;
#ifdef WOLFSSL_FUNC_TIME_LOG
fprintf(stderr, "%17.3f: START - %s\n", now, wc_func_name[funcNum]);
WOLFSSL_DEBUG_PRINTF("%17.3f: START - %s\n",
now, wc_func_name[funcNum]);
#endif
wc_func_start[funcNum] = now;
}
@@ -265,7 +266,8 @@ void WOLFSSL_END(int funcNum)
double now = current_time(0) * 1000.0;
wc_func_time[funcNum] += now - wc_func_start[funcNum];
#ifdef WOLFSSL_FUNC_TIME_LOG
fprintf(stderr, "%17.3f: END - %s\n", now, wc_func_name[funcNum]);
WOLFSSL_DEBUG_PRINTF("%17.3f: END - %s\n",
now, wc_func_name[funcNum]);
#endif
}
}
@@ -278,11 +280,11 @@ void WOLFSSL_TIME(int count)
for (i = 0; i < WC_FUNC_COUNT; i++) {
if (wc_func_time[i] > 0) {
avg = wc_func_time[i] / count;
fprintf(stderr, "%8.3f ms: %s\n", avg, wc_func_name[i]);
WOLFSSL_DEBUG_PRINTF("%8.3f ms: %s\n", avg, wc_func_name[i]);
total += avg;
}
}
fprintf(stderr, "%8.3f ms\n", total);
WOLFSSL_DEBUG_PRINTF("%8.3f ms\n", total);
}
#endif
@@ -1850,36 +1852,21 @@ static int backtrace_callback(void *data, uintptr_t pc, const char *filename,
*(int *)data = 1;
return 0;
}
#ifdef NO_STDIO_FILESYSTEM
printf(" #%d %p in %s %s:%d\n", (*(int *)data)++, (void *)pc,
function, filename, lineno);
#else
fprintf(stderr, " #%d %p in %s %s:%d\n", (*(int *)data)++, (void *)pc,
function, filename, lineno);
#endif
WOLFSSL_DEBUG_PRINTF(" #%d %p in %s %s:%d\n", (*(int *)data)++,
(void *)pc, function, filename, lineno);
return 0;
}
static void backtrace_error(void *data, const char *msg, int errnum) {
(void)data;
#ifdef NO_STDIO_FILESYSTEM
printf("ERR TRACE: error %d while backtracing: %s", errnum, msg);
#else
fprintf(stderr, "ERR TRACE: error %d while backtracing: %s", errnum, msg);
#endif
WOLFSSL_DEBUG_PRINTF("ERR TRACE: error %d while backtracing: %s",
errnum, msg);
}
static void backtrace_creation_error(void *data, const char *msg, int errnum) {
(void)data;
#ifdef NO_STDIO_FILESYSTEM
printf("ERR TRACE: internal error %d "
WOLFSSL_DEBUG_PRINTF("ERR TRACE: internal error %d "
"while initializing backtrace facility: %s", errnum, msg);
printf("ERR TRACE: internal error "
"while initializing backtrace facility");
#else
fprintf(stderr, "ERR TRACE: internal error %d "
"while initializing backtrace facility: %s", errnum, msg);
#endif
}
static int backtrace_init(struct backtrace_state **backtrace_state) {

20
wolfssl/wolfcrypt/error-crypt.h
View File

@@ -349,22 +349,12 @@ WOLFSSL_ABI WOLFSSL_API const char* wc_GetErrorString(int error);
#endif
#endif
#ifndef WC_ERR_TRACE
#ifdef NO_STDIO_FILESYSTEM
#define WC_ERR_TRACE(label) \
( printf("ERR TRACE: %s L %d %s (%d)\n", \
__FILE__, __LINE__, #label, label), \
WOLFSSL_DEBUG_BACKTRACE_RENDER_CLAUSE, \
label \
#define WC_ERR_TRACE(label) \
( WOLFSSL_DEBUG_PRINTF("ERR TRACE: %s L %d %s (%d)\n", \
__FILE__, __LINE__, #label, label), \
WOLFSSL_DEBUG_BACKTRACE_RENDER_CLAUSE, \
label \
)
#else
#define WC_ERR_TRACE(label) \
( fprintf(stderr, \
"ERR TRACE: %s L %d %s (%d)\n", \
__FILE__, __LINE__, #label, label), \
WOLFSSL_DEBUG_BACKTRACE_RENDER_CLAUSE, \
label \
)
#endif
#endif
#include <wolfssl/debug-trace-error-codes.h>
#else

12
wolfssl/wolfcrypt/logging.h
View File

@@ -550,6 +550,8 @@ WOLFSSL_API void wolfSSL_SetLoggingPrefix(const char* prefix);
#define WOLFSSL_DEBUG_PRINTF_FN printk
#elif defined(WOLFSSL_RENESAS_RA6M4)
#define WOLFSSL_DEBUG_PRINTF_FN myprintf
#elif defined(NO_STDIO_FILESYSTEM)
#define WOLFSSL_DEBUG_PRINTF_FN printf
#else
#define WOLFSSL_DEBUG_PRINTF_FN fprintf
#define WOLFSSL_DEBUG_PRINTF_FIRST_ARGS stderr,
@@ -561,14 +563,8 @@ WOLFSSL_API void wolfSSL_SetLoggingPrefix(const char* prefix);
#if defined(WOLFSSL_DEBUG_PRINTF_FN) && !defined(WOLFSSL_DEBUG_PRINTF)
#if defined(WOLF_NO_VARIADIC_MACROS)
#if defined(WOLFSSL_ESPIDF)
/* ESP-IDF supports variadic. Do not use WOLF_NO_VARIADIC_MACROS.
* This is only for WOLF_NO_VARIADIC_MACROS testing: */
#define WOLFSSL_DEBUG_PRINTF(a) \
WOLFSSL_DEBUG_PRINTF_FN(WOLFSSL_DEBUG_PRINTF_FIRST_ARGS a)
#else
/* no variadic not defined for this platform */
#endif
#define WOLFSSL_DEBUG_PRINTF(a) \
WOLFSSL_DEBUG_PRINTF_FN(WOLFSSL_DEBUG_PRINTF_FIRST_ARGS a)
#else
#define WOLFSSL_DEBUG_PRINTF(...) \
WOLFSSL_DEBUG_PRINTF_FN(WOLFSSL_DEBUG_PRINTF_FIRST_ARGS __VA_ARGS__)