X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fmware%2Fformatwr.c;fp=bertos%2Fmware%2Fformatwr.c;h=ac2cbffe376ea28760122f15f617823240f88bbf;hb=f736a4877b8a420223c14da06be6ffe48772d44f;hp=0a36cee8d5daca793250c0c42463ae93d1ea2343;hpb=a339ec940ca0ef10f96f2365a5c8dcb1a2aef612;p=bertos.git diff --git a/bertos/mware/formatwr.c b/bertos/mware/formatwr.c index 0a36cee8..ac2cbffe 100644 --- a/bertos/mware/formatwr.c +++ b/bertos/mware/formatwr.c @@ -899,13 +899,22 @@ FLOATING_CONVERSION: CONVERSION_LOOP: #if CONFIG_PRINTF > PRINTF_NOMODIFIERS if (h_modifier) - u_val = (format_flag == 'd') ? - (short)va_arg(ap, int) : (unsigned short)va_arg(ap, int); + { + if (format_flag == 'd') + u_val = (short)va_arg(ap, int); + else + u_val = (unsigned short)va_arg(ap, int); + } else if (l_modifier) u_val = va_arg(ap, long); else - u_val = (format_flag == 'd') ? - va_arg(ap,int) : va_arg(ap,unsigned int); + { + if (format_flag == 'd') + u_val = va_arg(ap, int); + else + u_val = va_arg(ap, unsigned int); + } + #else /* CONFIG_PRINTF > PRINTF_NOMODIFIERS */ u_val = va_arg(ap,int); #endif /* CONFIG_PRINTF > PRINTF_NOMODIFIERS */