ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #4192 from fmanno/improve-mbed_error_vprintf 

Fix gcc [-Wsign-compare] warning
pull/4224/head
Anna Bridge 2017-04-20 16:46:28 +01:00 committed by GitHub
parent 2ae34c45d0 4398b1f3c1
commit f1576bf255
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
platform/mbed_board.c
View File

@ -75,19 +75,16 @@ void mbed_error_printf(const char* format, ...) {
void mbed_error_vfprintf(const char * format, va_list arg) { void mbed_error_vfprintf(const char * format, va_list arg) {
#if DEVICE_SERIAL #if DEVICE_SERIAL
#define ERROR_BUF_SIZE (128)
#if MBED_CONF_PLATFORM_STDIO_CONVERT_NEWLINES
char stdio_out_prev;
#endif
core_util_critical_section_enter(); core_util_critical_section_enter();
char buffer[128]; char buffer[ERROR_BUF_SIZE];
int size = vsprintf(buffer, format, arg); int size = vsnprintf(buffer, ERROR_BUF_SIZE, format, arg);
if (size > 0) { if (size > 0) {
if (!stdio_uart_inited) { if (!stdio_uart_inited) {
serial_init(&stdio_uart, STDIO_UART_TX, STDIO_UART_RX); serial_init(&stdio_uart, STDIO_UART_TX, STDIO_UART_RX);
} }
#if MBED_CONF_PLATFORM_STDIO_CONVERT_NEWLINES #if MBED_CONF_PLATFORM_STDIO_CONVERT_NEWLINES
char stdio_out_prev = '\0';
for (int i = 0; i < size; i++) { for (int i = 0; i < size; i++) {
if (buffer[i] == '\n' && stdio_out_prev != '\r') { if (buffer[i] == '\n' && stdio_out_prev != '\r') {
serial_putc(&stdio_uart, '\r'); serial_putc(&stdio_uart, '\r');