summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorRasmus Villemoes <linux@rasmusvillemoes.dk>2015-04-15 16:17:08 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-04-15 16:35:23 -0700
commit3ea8d440a86b85c63c2bb7f73988626e682db5f0 (patch)
tree8554f5f9a6dc1dc30601b88fa752993ff761d353 /lib
parente26c12c777118d65aeb97eb1651338e7decae80e (diff)
downloadlinux-stable-3ea8d440a86b85c63c2bb7f73988626e682db5f0.tar.gz
linux-stable-3ea8d440a86b85c63c2bb7f73988626e682db5f0.tar.bz2
linux-stable-3ea8d440a86b85c63c2bb7f73988626e682db5f0.zip
lib/vsprintf.c: eliminate duplicate hex string array
gcc doesn't merge or overlap const char[] objects with identical contents (probably language lawyers would also insist that these things have different addresses), but there's no reason to have the string "0123456789ABCDEF" occur in multiple places. hex_asc_upper is declared in kernel.h and defined in lib/hexdump.c, which is unconditionally compiled in. 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.c7
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
char *number(char *buf, char *end, unsigned long long num,
struct printf_spec spec)
{
- /* we are called with base 8, 10 or 16, only, thus don't need "G..." */
- static const char digits[16] = "0123456789ABCDEF"; /* "GHIJKLMNOPQRSTUVWXYZ"; */
-
char tmp[3 * sizeof(num)];
char sign;
char locase;
@@ -422,7 +419,7 @@ char *number(char *buf, char *end, unsigned long long num,
/* generate full string in tmp[], in reverse order */
i = 0;
if (num < spec.base)
- tmp[i++] = digits[num] | locase;
+ tmp[i++] = hex_asc_upper[num] | locase;
else if (spec.base != 10) { /* 8 or 16 */
int mask = spec.base - 1;
int shift = 3;
@@ -430,7 +427,7 @@ char *number(char *buf, char *end, unsigned long long num,
if (spec.base == 16)
shift = 4;
do {
- tmp[i++] = (digits[((unsigned char)num) & mask] | locase);
+ tmp[i++] = (hex_asc_upper[((unsigned char)num) & mask] | locase);
num >>= shift;
} while (num);
} else { /* base 10 */