korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-24 20:54:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

vsprintf: unify the format decoding layer for its 3 users, cleanup

Browse Source 
Impact: cleanup

Rename FORMAT_TYPE_WITDH
 to => FORMAT_TYPE_WIDTH

Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jeremy Fitzhardinge <jeremy@goop.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Vegard Nossum 2009-03-14 12:08:50 +01:00 committed by Ingo Molnar
parent adf26f84a6
commit ed681a91ab
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/vsprintf.c
View File

@ -398,7 +398,7 @@ static noinline char* put_dec(char *buf, unsigned long long num)
enum format_type { enum format_type {
FORMAT_TYPE_NONE, /* Just a string part */ FORMAT_TYPE_NONE, /* Just a string part */
FORMAT_TYPE_WITDH, FORMAT_TYPE_WIDTH,
FORMAT_TYPE_PRECISION, FORMAT_TYPE_PRECISION,
FORMAT_TYPE_CHAR, FORMAT_TYPE_CHAR,
FORMAT_TYPE_STR, FORMAT_TYPE_STR,
@ -770,7 +770,7 @@ static int format_decode(const char *fmt, struct printf_spec *spec)
const char *start = fmt; const char *start = fmt;
/* we finished early by reading the field width */ /* we finished early by reading the field width */
if (spec->type == FORMAT_TYPE_WITDH) { if (spec->type == FORMAT_TYPE_WIDTH) {
if (spec->field_width < 0) { if (spec->field_width < 0) {
spec->field_width = -spec->field_width; spec->field_width = -spec->field_width;
spec->flags |= LEFT; spec->flags |= LEFT;
@ -828,7 +828,7 @@ static int format_decode(const char *fmt, struct printf_spec *spec)
spec->field_width = skip_atoi(&fmt); spec->field_width = skip_atoi(&fmt);
else if (*fmt == '*') { else if (*fmt == '*') {
/* it's the next argument */ /* it's the next argument */
spec->type = FORMAT_TYPE_WITDH; spec->type = FORMAT_TYPE_WIDTH;
return ++fmt - start; return ++fmt - start;
} }
@ -1002,7 +1002,7 @@ int vsnprintf(char *buf, size_t size, const char *fmt, va_list args)
break; break;
} }
case FORMAT_TYPE_WITDH: case FORMAT_TYPE_WIDTH:
spec.field_width = va_arg(args, int); spec.field_width = va_arg(args, int);
break; break;
@ -1306,7 +1306,7 @@ do { \
case FORMAT_TYPE_NONE: case FORMAT_TYPE_NONE:
break; break;
case FORMAT_TYPE_WITDH: case FORMAT_TYPE_WIDTH:
case FORMAT_TYPE_PRECISION: case FORMAT_TYPE_PRECISION:
save_arg(int); save_arg(int);
break; break;
@ -1472,7 +1472,7 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
break; break;
} }
case FORMAT_TYPE_WITDH: case FORMAT_TYPE_WIDTH:
spec.field_width = get_arg(int); spec.field_width = get_arg(int);
break; break;