]> err.no Git - linux-2.6/commitdiff
ftrace: simplify hexprint
authorThomas Gleixner <tglx@linutronix.de>
Mon, 12 May 2008 19:21:00 +0000 (21:21 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Fri, 23 May 2008 19:50:38 +0000 (21:50 +0200)
simplify hex to ascii conversion.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
kernel/trace/trace.c

index 4723e012151d99e558c416c3656351f7c8ef9a61..627e39936ea75fff465b9b77630cf85e246c96e9 100644 (file)
@@ -248,19 +248,18 @@ trace_seq_putmem(struct trace_seq *s, void *mem, size_t len)
 }
 
 #define HEX_CHARS 17
+static const char hex2asc[] = "0123456789abcdef";
 
 static int
 trace_seq_putmem_hex(struct trace_seq *s, void *mem, size_t len)
 {
        unsigned char hex[HEX_CHARS];
-       unsigned char *data;
+       unsigned char *data = mem;
        unsigned char byte;
        int i, j;
 
        BUG_ON(len >= HEX_CHARS);
 
-       data = mem;
-
 #ifdef __BIG_ENDIAN
        for (i = 0, j = 0; i < len; i++) {
 #else
@@ -268,22 +267,10 @@ trace_seq_putmem_hex(struct trace_seq *s, void *mem, size_t len)
 #endif
                byte = data[i];
 
-               hex[j]   = byte & 0x0f;
-               if (hex[j] >= 10)
-                       hex[j] += 'a' - 10;
-               else
-                       hex[j] += '0';
-               j++;
-
-               hex[j] = byte >> 4;
-               if (hex[j] >= 10)
-                       hex[j] += 'a' - 10;
-               else
-                       hex[j] += '0';
-               j++;
+               hex[j++] = hex2asc[byte & 0x0f];
+               hex[j++] = hex2asc[byte >> 4];
        }
-       hex[j] = ' ';
-       j++;
+       hex[j++] = ' ';
 
        return trace_seq_putmem(s, hex, j);
 }