Correct last patch and use outchar instead of PUTC to output single characters.

diff --git a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c
index ce565e70d5b1fe03f9b035064437228e4300571e..3703e535f6692643a93863f568a3ed5f6fecef8a 100644 (file)
--- a/stdio-common/vfprintf.c
+++ b/stdio-common/vfprintf.c
@@ -677,16 +677,16 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap)
            }                                                                 \
                                                                              \
          if (is_negative)                                                    \
-           PUTC (L_('-'), s);                                                \
+           outchar (L_('-'));                                                \
          else if (showsign)                                                  \
-           PUTC (L_('+'), s);                                                \
+           outchar (L_('+'));                                                \
          else if (space)                                                     \
-           PUTC (L_(' '), s);                                                \
+           outchar (L_(' '));                                                \
                                                                              \
          if (number.word != 0 && alt && base == 16)                          \
            {                                                                 \
-             PUTC (L_('0'), s);                                              \
-             PUTC (spec, s);                                                 \
+             outchar (L_('0'));                                              \
+             outchar (spec);                                                 \
            }                                                                 \
                                                                              \
          width += prec;                                                      \
@@ -700,24 +700,24 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap)
        {                                                                     \
          if (is_negative)                                                    \
            {                                                                 \
-             PUTC (L_('-'), s);                                              \
+             outchar (L_('-'));                                              \
              --width;                                                        \
            }                                                                 \
          else if (showsign)                                                  \
            {                                                                 \
-             PUTC (L_('+'), s);                                              \
+             outchar (L_('+'));                                              \
              --width;                                                        \
            }                                                                 \
          else if (space)                                                     \
            {                                                                 \
-             PUTC (L_(' '), s);                                              \
+             outchar (L_(' '));                                              \
              --width;                                                        \
            }                                                                 \
                                                                              \
          if (number.word != 0 && alt && base == 16)                          \
            {                                                                 \
-             PUTC (L_('0'), s);                                              \
-             PUTC (spec, s);                                                 \
+             outchar (L_('0'));                                              \
+             outchar (spec);                                                 \
              width -= 2;                                                     \
            }                                                                 \
                                                                              \