Killed bug in processing of 'h' prefix. Patch taken from linux-2.1.129.

diff --git a/lib/printf.c b/lib/printf.c
index 8e6ec76eb984583b8bb76e017a8797544f70f30f..a8259ab536691ac99ab2c5d26b4aacb47d6895be 100644 (file)
--- a/lib/printf.c
+++ b/lib/printf.c
@@ -289,10 +289,9 @@ int bvsnprintf(char *buf, int size, const char *fmt, va_list args)
                if (qualifier == 'l')
                        num = va_arg(args, unsigned long);
                else if (qualifier == 'h') {
+                       num = (unsigned short) va_arg(args, int);
                        if (flags & SIGN)
-                               num = va_arg(args, short);
-                       else
-                               num = va_arg(args, unsigned short);
+                               num = (short) num;
                } else if (flags & SIGN)
                        num = va_arg(args, int);
                else