[src/trunk]: src/sys/lib/libsa Revert stupid and untested changes. There was ...

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

details:   https://anonhg.NetBSD.org/src/rev/a17e26b7cf82
branches:  trunk
changeset: 331910:a17e26b7cf82
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Sat Aug 30 14:24:02 2014 +0000

description:
Revert stupid and untested changes. There was no extra copy in the macros.

Christos, you should reread our commit guideline as a Core member.

diffstat:

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

diffs (83 lines):

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