adafruit-mirror/arduino-esp32
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

log_printf: Restructured log_printf for wrapping (#7567)

Browse source
This commit is contained in:
Sanket Wadekar 2022-12-12 18:31:55 +05:30 committed by GitHub
parent 3af0b44f38
commit 165d62472a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
cores/esp32/esp32-hal-uart.c
View file

@ -496,21 +496,18 @@ int uartGetDebug()
return s_uart_debug_nr; return s_uart_debug_nr;
} }
int log_printf(const char *format, ...) int log_printfv(const char *format, va_list arg)
{ {
static char loc_buf[64]; static char loc_buf[64];
char * temp = loc_buf; char * temp = loc_buf;
int len; int len;
va_list arg;
va_list copy; va_list copy;
va_start(arg, format);
va_copy(copy, arg); va_copy(copy, arg);
len = vsnprintf(NULL, 0, format, copy); len = vsnprintf(NULL, 0, format, copy);
va_end(copy); va_end(copy);
if(len >= sizeof(loc_buf)){ if(len >= sizeof(loc_buf)){
temp = (char*)malloc(len+1); temp = (char*)malloc(len+1);
if(temp == NULL) { if(temp == NULL) {
va_end(arg);
return 0; return 0;
} }
} }
@ -528,13 +525,22 @@ int log_printf(const char *format, ...)
xSemaphoreGive(_uart_bus_array[s_uart_debug_nr].lock); xSemaphoreGive(_uart_bus_array[s_uart_debug_nr].lock);
} }
#endif #endif
va_end(arg);
if(len >= sizeof(loc_buf)){ if(len >= sizeof(loc_buf)){
free(temp); free(temp);
} }
return len; return len;
} }
int log_printf(const char *format, ...)
{
int len;
va_list arg;
va_start(arg, format);
len = log_printfv(format, arg);
va_end(arg);
return len;
}
static void log_print_buf_line(const uint8_t *b, size_t len, size_t total_len){ static void log_print_buf_line(const uint8_t *b, size_t len, size_t total_len){
for(size_t i = 0; i<len; i++){ for(size_t i = 0; i<len; i++){