[src/trunk]: src/sys/lib/libsa remove extra copy of the macro.

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9e4f3c7f74f2
branches:  trunk
changeset: 802045:9e4f3c7f74f2
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Aug 30 13:09:27 2014 +0000

description:
remove extra copy of the macro.

diffstat:

 sys/lib/libsa/subr_prf.c |  32 ++++++++++++--------------------
 1 files changed, 12 insertions(+), 20 deletions(-)

diffs (83 lines):

diff -r fd7f93fbfe73 -r 9e4f3c7f74f2 sys/lib/libsa/subr_prf.c
--- a/sys/lib/libsa/subr_prf.c  Sat Aug 30 13:02:01 2014 +0000
+++ b/sys/lib/libsa/subr_prf.c  Sat Aug 30 13:09:27 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: subr_prf.c,v 1.25 2014/08/30 12:23:38 tsutsui Exp $    */
+/*     $NetBSD: subr_prf.c,v 1.26 2014/08/30 13:09:27 christos Exp $   */
 
 /*-
  * Copyright (c) 1993
@@ -79,30 +79,22 @@
 #define ZEROPAD                0x40
 #define NEGATIVE       0x80
 #define KPRINTN(base)  kprintn(put, ul, base, lflag, width)
-#define RADJUSTZEROPAD()                                       \
-do {                                                           \
-       if ((lflag & (ZEROPAD|LADJUST)) == ZEROPAD) {           \
-               while (width-- > 0)                             \
-                       put('0');                               \
-       }                                                       \
-} while (/*CONSTCOND*/0)
-#define LADJUSTPAD()                                           \
+#define LADJUSTPAD(c)                                          \
 do {                                                           \
        if (lflag & LADJUST) {                                  \
                while (width-- > 0)                             \
-                       put(' ');                               \
+                       put(c);                                 \
        }                                                       \
 } while (/*CONSTCOND*/0)
-#define RADJUSTPAD()                                           \
+#define RADJUSTPAD(c)                                          \
 do {                                                           \
        if ((lflag & (ZEROPAD|LADJUST)) == 0) {                 \
                while (width-- > 0)                             \
-                       put(' ');                               \
+                       put(c);                                 \
        }                                                       \
 } while (/*CONSTCOND*/0)
 #else  /* LIBSA_PRINTF_WIDTH_SUPPORT */
 #define KPRINTN(base)  kprintn(put, ul, base)
-#define RADJUSTZEROPAD()       /**/
 #define LADJUSTPAD()           /**/
 #define RADJUSTPAD()           /**/
 #endif /* LIBSA_PRINTF_WIDTH_SUPPORT */
@@ -235,9 +227,9 @@
 #ifdef LIBSA_PRINTF_WIDTH_SUPPORT
                        --width;
 #endif
-                       RADJUSTPAD();
+                       RADJUSTPAD(' ');
                        put(ch & 0xFF);
-                       LADJUSTPAD();
+                       LADJUSTPAD(' ');
                        break;
                case 's':
                        p = va_arg(ap, char *);
@@ -246,10 +238,10 @@
                                continue;
                        width -= q - p;
 #endif
-                       RADJUSTPAD();
+                       RADJUSTPAD(' ');
                        while ((ch = (unsigned char)*p++))
                                put(ch);
-                       LADJUSTPAD();
+                       LADJUSTPAD(' ');
                        break;
                case 'd':
                        ul =
@@ -332,10 +324,10 @@
                        put(*--p);
        }
 #endif
-       RADJUSTPAD();
-       RADJUSTZEROPAD();
+       RADJUSTPAD(' ');
+       RADJUSTPAD('0');
        do {
                put(*--p);
        } while (p > buf);
-       LADJUSTPAD();
+       LADJUSTPAD(' ');
 }