]> git.sur5r.net Git - u-boot/commitdiff
tiny-printf: Tidy up a few nits
authorSimon Glass <sjg@chromium.org>
Sat, 14 May 2016 20:02:52 +0000 (14:02 -0600)
committerSimon Glass <sjg@chromium.org>
Fri, 27 May 2016 02:48:44 +0000 (20:48 -0600)
- Rename 'w' to 'width' to make it more obvious what it is used for
- Use bool and int types instead of char to avoid register-masking on
32-bit machines

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Stefan Roese <sr@denx.de>
lib/tiny-printf.c

index a06abed49590ecbdbb8017f4df68e0c2208f3016..fbd5368c0b35b9152315437d07fc16c92e4895c7 100644 (file)
@@ -52,8 +52,8 @@ int vprintf(const char *fmt, va_list va)
                if (ch != '%') {
                        putc(ch);
                } else {
-                       char lz = 0;
-                       char w = 0;
+                       bool lz = false;
+                       int width = 0;
 
                        ch = *(fmt++);
                        if (ch == '0') {
@@ -62,9 +62,9 @@ int vprintf(const char *fmt, va_list va)
                        }
 
                        if (ch >= '0' && ch <= '9') {
-                               w = 0;
+                               width = 0;
                                while (ch >= '0' && ch <= '9') {
-                                       w = (w * 10) + ch - '0';
+                                       width = (width * 10) + ch - '0';
                                        ch = *fmt++;
                                }
                        }
@@ -73,7 +73,7 @@ int vprintf(const char *fmt, va_list va)
                        zs = 0;
 
                        switch (ch) {
-                       case 0:
+                       case '\0':
                                goto abort;
                        case 'u':
                        case 'd':
@@ -112,9 +112,9 @@ int vprintf(const char *fmt, va_list va)
 
                        *bf = 0;
                        bf = p;
-                       while (*bf++ && w > 0)
-                               w--;
-                       while (w-- > 0)
+                       while (*bf++ && width > 0)
+                               width--;
+                       while (width-- > 0)
                                putc(lz ? '0' : ' ');
                        if (p) {
                                while ((ch = *p++))