diff options
Diffstat (limited to 'lib/libc/snprintf.c')
| -rw-r--r-- | lib/libc/snprintf.c | 36 |
1 files changed, 14 insertions, 22 deletions
diff --git a/lib/libc/snprintf.c b/lib/libc/snprintf.c index 42faa269d..3b175ed6a 100644 --- a/lib/libc/snprintf.c +++ b/lib/libc/snprintf.c @@ -10,16 +10,20 @@ #include <common/debug.h> #include <plat/common/platform.h> +#define CHECK_AND_PUT_CHAR(buf, size, chars_printed, ch) \ + do { \ + if ((chars_printed) < (size)) { \ + *(buf) = (ch); \ + (buf)++; \ + } \ + (chars_printed)++; \ + } while (false) + static void string_print(char **s, size_t n, size_t *chars_printed, const char *str) { while (*str != '\0') { - if (*chars_printed < n) { - *(*s) = *str; - (*s)++; - } - - (*chars_printed)++; + CHECK_AND_PUT_CHAR(*s, n, *chars_printed, *str); str++; } } @@ -131,11 +135,7 @@ int vsnprintf(char *s, size_t n, const char *fmt, va_list args) loop: switch (*fmt) { case '%': - if (chars_printed < n) { - *s = '%'; - s++; - } - chars_printed++; + CHECK_AND_PUT_CHAR(s, n, chars_printed, '%'); break; case '0': case '1': @@ -165,12 +165,8 @@ loop: num = va_arg(args, int); if (num < 0) { - if (chars_printed < n) { - *s = '-'; - s++; - } - chars_printed++; - + CHECK_AND_PUT_CHAR(s, n, chars_printed, + '-'); unum = (unsigned int)-num; } else { unum = (unsigned int)num; @@ -217,13 +213,9 @@ loop: continue; } - if (chars_printed < n) { - *s = *fmt; - s++; - } + CHECK_AND_PUT_CHAR(s, n, chars_printed, *fmt); fmt++; - chars_printed++; } if (n > 0U) { |