espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-29 18:27:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(ble): fixed printf va list cross function pass failure

Browse Source
This commit is contained in:
Zhou Xiao
2025-05-23 12:29:46 +08:00
parent ba06a39abe
commit 8a014c33c0
1 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
components/bt/common/ble_log/ble_log_spi_out.c
View File

@ -183,7 +183,7 @@ static void spi_out_log_flush(void);
static int spi_out_ul_log_init(void);
static void spi_out_ul_log_deinit(void);
static void spi_out_ul_log_write(uint8_t source, const uint8_t *addr, uint16_t len, bool with_ts);
static bool spi_out_ul_log_printf(uint8_t source, const char *format, va_list args);
static bool spi_out_ul_log_printf(uint8_t source, const char *format, va_list args, int offset);
#if SPI_OUT_LL_ENABLED
static int spi_out_ll_log_init(void);
@ -589,12 +589,14 @@ static void spi_out_ul_log_write(uint8_t source, const uint8_t *addr, uint16_t l
spi_out_log_cb_write_loss(ul_log_cb);
}
static bool spi_out_ul_log_printf(uint8_t source, const char *format, va_list args)
static bool spi_out_ul_log_printf(uint8_t source, const char *format, va_list args, int offset)
{
int len = vsnprintf((char *)ul_log_str_buf, SPI_OUT_UL_LOG_STR_BUF_SIZE, format, args);
int len = vsnprintf((char *)(ul_log_str_buf + offset),
SPI_OUT_UL_LOG_STR_BUF_SIZE - offset, format, args);
if (len < 0) {
return false;
}
len += offset;
// Truncate string if overflowed
if (len >= SPI_OUT_UL_LOG_STR_BUF_SIZE) {
@ -1103,16 +1105,23 @@ int ble_log_spi_out_printf(uint8_t source, const char *format, ...)
return -1;
}
if (!format) {
return -1;
}
// Get arguments
va_list args;
va_start(args, format);
va_list args_copy;
va_copy(args_copy, args);
xSemaphoreTake(ul_log_mutex, portMAX_DELAY);
bool ret = spi_out_ul_log_printf(source, format, args);
bool ret = spi_out_ul_log_printf(source, format, args_copy, 0);
xSemaphoreGive(ul_log_mutex);
va_end(args_copy);
va_end(args);
return ret? 0: -1;
}
@ -1122,18 +1131,29 @@ int ble_log_spi_out_printf_enh(uint8_t source, uint8_t level, const char *tag, c
return -1;
}
if (!tag || !format) {
return -1;
}
va_list args;
va_start(args, format);
va_list args_copy;
va_copy(args_copy, args);
// Create log prefix in the format: "[level][tag] "
bool ret = false;
xSemaphoreTake(ul_log_mutex, portMAX_DELAY);
snprintf((char *)ul_log_str_buf, SPI_OUT_UL_LOG_STR_BUF_SIZE,
"[%d][%s] %s", level, tag? tag: "NULL", format);
bool ret = spi_out_ul_log_printf(source, (const char *)ul_log_str_buf, args);
int prefix_len = snprintf((char *)ul_log_str_buf, SPI_OUT_UL_LOG_STR_BUF_SIZE,
"[%d][%s]", level, tag? tag: "NULL");
if ((prefix_len < 0) || (prefix_len >= SPI_OUT_UL_LOG_STR_BUF_SIZE)) {
goto exit;
}
ret = spi_out_ul_log_printf(source, format, args_copy, prefix_len);
exit:
xSemaphoreGive(ul_log_mutex);
va_end(args_copy);
va_end(args);
return ret? 0: -1;
}