Messages in this thread Patch in this message | | | Date | Mon, 16 Nov 2015 17:25:16 -0500 | From | Steven Rostedt <> | Subject | [PATCH v2] tools lib traceevents: Fix output of %llu for 64 bit values read on 32 bit machines |
| |
When a long value is read on 32 bit machines for 64 bit output, the parsing needs to change "%lu" into "%llu", as the value is read natively.
Unfortunately, if "%llu" is already there, the code will add another "l" to it and fail to parse it properly.
Cc: stable@vger.kernel.org Signed-off-by: Steven Rostedt <rostedt@goodmis.org> --- diff --git a/event-parse.c b/event-parse.c index 0a30253..ee5b720 100644 --- a/event-parse.c +++ b/event-parse.c @@ -4828,13 +4828,12 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct event sizeof(long) != 8) { char *p; - ls = 2; /* make %l into %ll */ - p = strchr(format, 'l'); - if (p) + if (ls == 1 && (p = strchr(format, 'l'))) memmove(p+1, p, strlen(p)+1); else if (strcmp(format, "%p") == 0) strcpy(format, "0x%llx"); + ls = 2; } switch (ls) { case -2:
| |