summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWolfgang Mauerer <wolfgang.mauerer@siemens.com>2012-03-22 11:18:21 +0100
committerNamhyung Kim <namhyung@kernel.org>2012-07-04 13:40:30 +0900
commitc5b35b731965d16fa8c966e288489857097e0b25 (patch)
tree95c3fc1fff8c2e47755914a85cb2f1ac8bd61d03
parentaaf05c725bed1c7a8c940d9215662c78bea05dfd (diff)
downloadop-kernel-dev-c5b35b731965d16fa8c966e288489857097e0b25.zip
op-kernel-dev-c5b35b731965d16fa8c966e288489857097e0b25.tar.gz
tools lib traceevent: Fix trace_printk for long integers
On 32 bit systems, a conversion of the trace_printk format string "%lu" -> "%llu" is intended (similar for %lx etc.) when a trace was taken on a machine with 64 bit long integers. However, the current code computes the bogus transformation "%lu" -> "%u". Fix this. Besides that, the transformation is only required on systems that don't use 64 bits for long integers natively. Signed-off-by: Wolfgang Mauerer <wolfgang.mauerer@siemens.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org> Link: http://lkml.kernel.org/r/1332411501-8059-3-git-send-email-wolfgang.mauerer@siemens.com Signed-off-by: Namhyung Kim <namhyung@kernel.org>
-rw-r--r--tools/lib/traceevent/event-parse.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c
index da06c33..ddee5a8 100644
--- a/tools/lib/traceevent/event-parse.c
+++ b/tools/lib/traceevent/event-parse.c
@@ -3895,14 +3895,15 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct event
break;
}
}
- if (pevent->long_size == 8 && ls) {
+ if (pevent->long_size == 8 && ls &&
+ sizeof(long) != 8) {
char *p;
ls = 2;
/* make %l into %ll */
p = strchr(format, 'l');
if (p)
- memmove(p, p+1, strlen(p)+1);
+ memmove(p+1, p, strlen(p)+1);
else if (strcmp(format, "%p") == 0)
strcpy(format, "0x%llx");
}
OpenPOWER on IntegriCloud