diff options
| author | Rasmus Villemoes <linux@rasmusvillemoes.dk> | 2015-04-16 01:17:11 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-16 01:35:23 +0200 |
| commit | d1c1b12137fff14363d0cf45c8b7a9ec5cd4578b (patch) | |
| tree | afceb4ce1759b401af72ee5110a683974c4cfbb6 /lib | |
| parent | lib/vsprintf.c: eliminate duplicate hex string array (diff) | |
| download | linux-d1c1b12137fff14363d0cf45c8b7a9ec5cd4578b.tar.xz linux-d1c1b12137fff14363d0cf45c8b7a9ec5cd4578b.zip | |
lib/vsprintf.c: another small hack
Making ZEROPAD == '0'-' ', we can eliminate a few more instructions.
Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Tejun Heo <tj@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/vsprintf.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/vsprintf.c b/lib/vsprintf.c index 7a299d43987a..2753f9261115 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -341,10 +341,10 @@ int num_to_str(char *buf, int size, unsigned long long num) } #define SIGN 1 /* unsigned/signed, must be 1 */ -#define ZEROPAD 2 /* pad with zero */ +#define LEFT 2 /* left justified */ #define PLUS 4 /* show plus */ #define SPACE 8 /* space if plus */ -#define LEFT 16 /* left justified */ +#define ZEROPAD 16 /* pad with zero, must be 16 == '0' - ' ' */ #define SMALL 32 /* use lowercase in hex (must be 32 == 0x20) */ #define SPECIAL 64 /* prefix hex with "0x", octal with "0" */ @@ -467,7 +467,8 @@ char *number(char *buf, char *end, unsigned long long num, } /* zero or space padding */ if (!(spec.flags & LEFT)) { - char c = (spec.flags & ZEROPAD) ? '0' : ' '; + char c = ' ' + (spec.flags & ZEROPAD); + BUILD_BUG_ON(' ' + ZEROPAD != '0'); while (--spec.field_width >= 0) { if (buf < end) *buf = c; |