diff options
Diffstat (limited to 'lib/vsprintf.c')
| -rw-r--r-- | lib/vsprintf.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/vsprintf.c b/lib/vsprintf.c index 98f1ce907d3d..7a299d43987a 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c | |||
| @@ -383,9 +383,6 @@ static noinline_for_stack | |||
| 383 | char *number(char *buf, char *end, unsigned long long num, | 383 | char *number(char *buf, char *end, unsigned long long num, |
| 384 | struct printf_spec spec) | 384 | struct printf_spec spec) |
| 385 | { | 385 | { |
| 386 | /* we are called with base 8, 10 or 16, only, thus don't need "G..." */ | ||
| 387 | static const char digits[16] = "0123456789ABCDEF"; /* "GHIJKLMNOPQRSTUVWXYZ"; */ | ||
| 388 | |||
| 389 | char tmp[3 * sizeof(num)]; | 386 | char tmp[3 * sizeof(num)]; |
| 390 | char sign; | 387 | char sign; |
| 391 | char locase; | 388 | char locase; |
| @@ -422,7 +419,7 @@ char *number(char *buf, char *end, unsigned long long num, | |||
| 422 | /* generate full string in tmp[], in reverse order */ | 419 | /* generate full string in tmp[], in reverse order */ |
| 423 | i = 0; | 420 | i = 0; |
| 424 | if (num < spec.base) | 421 | if (num < spec.base) |
| 425 | tmp[i++] = digits[num] | locase; | 422 | tmp[i++] = hex_asc_upper[num] | locase; |
| 426 | else if (spec.base != 10) { /* 8 or 16 */ | 423 | else if (spec.base != 10) { /* 8 or 16 */ |
| 427 | int mask = spec.base - 1; | 424 | int mask = spec.base - 1; |
| 428 | int shift = 3; | 425 | int shift = 3; |
| @@ -430,7 +427,7 @@ char *number(char *buf, char *end, unsigned long long num, | |||
| 430 | if (spec.base == 16) | 427 | if (spec.base == 16) |
| 431 | shift = 4; | 428 | shift = 4; |
| 432 | do { | 429 | do { |
| 433 | tmp[i++] = (digits[((unsigned char)num) & mask] | locase); | 430 | tmp[i++] = (hex_asc_upper[((unsigned char)num) & mask] | locase); |
| 434 | num >>= shift; | 431 | num >>= shift; |
| 435 | } while (num); | 432 | } while (num); |
| 436 | } else { /* base 10 */ | 433 | } else { /* base 10 */ |
