tiny-printf: Tidy up a few nits

- 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>
This commit is contained in:
Simon Glass 2016-05-14 14:02:52 -06:00
parent d0375f3cc5
commit 1fb67608b3

View file

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