Kconfig: Move CONFIG_FIT and related options to Kconfig

[platform/kernel/u-boot.git] / lib / tiny-printf.c

diff --git a/lib/tiny-printf.c b/lib/tiny-printf.c
index 6766a8f..a06abed 100644 (file)
--- a/lib/tiny-printf.c
+++ b/lib/tiny-printf.c
@@ -40,17 +40,14 @@ static void div_out(unsigned int *num, unsigned int div)
                out_dgt(dgt);
 }
 
-int printf(const char *fmt, ...)
+int vprintf(const char *fmt, va_list va)
 {
-       va_list va;
        char ch;
        char *p;
        unsigned int num;
        char buf[12];
        unsigned int div;
 
-       va_start(va, fmt);
-
        while ((ch = *(fmt++))) {
                if (ch != '%') {
                        putc(ch);
@@ -85,13 +82,21 @@ int printf(const char *fmt, ...)
                                        num = -(int)num;
                                        out('-');
                                }
-                               for (div = 1000000000; div; div /= 10)
-                                       div_out(&num, div);
+                               if (!num) {
+                                       out_dgt(0);
+                               } else {
+                                       for (div = 1000000000; div; div /= 10)
+                                               div_out(&num, div);
+                               }
                                break;
                        case 'x':
                                num = va_arg(va, unsigned int);
-                               for (div = 0x10000000; div; div /= 0x10)
-                                       div_out(&num, div);
+                               if (!num) {
+                                       out_dgt(0);
+                               } else {
+                                       for (div = 0x10000000; div; div /= 0x10)
+                                               div_out(&num, div);
+                               }
                                break;
                        case 'c':
                                out((char)(va_arg(va, int)));
@@ -111,12 +116,25 @@ int printf(const char *fmt, ...)
                                w--;
                        while (w-- > 0)
                                putc(lz ? '0' : ' ');
-                       while ((ch = *p++))
-                               putc(ch);
+                       if (p) {
+                               while ((ch = *p++))
+                                       putc(ch);
+                       }
                }
        }
 
 abort:
-       va_end(va);
        return 0;
 }
+
+int printf(const char *fmt, ...)
+{
+       va_list va;
+       int ret;
+
+       va_start(va, fmt);
+       ret = vprintf(fmt, va);
+       va_end(va);
+
+       return ret;
+}