aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Wood <scottwood@freescale.com>2015-08-31 16:16:37 -0500
committerSteven Rostedt <rostedt@goodmis.org>2016-02-09 14:21:03 -0500
commit71fa7295f3d14064d98170440f926f7b1f3a29e8 (patch)
tree705123d1886ffdff1129f2e4b1f131db679fd48b
parentd6e4b8435adec40b4b88e06fe9b258b3342f5ff1 (diff)
downloadtrace-cmd-71fa7295f3d14064d98170440f926f7b1f3a29e8.tar.gz
tools lib traceevent: Support %ps/%pS
Commits such as 65dd297ac25565 ("xfs: %pF is only for function pointers") caused a regression because pretty_print() didn't support %ps/%pS. The current %pf/%pF implementation in pretty_print() is what %ps/%pS is supposed to do, so use the same code for %ps/%pS. Addressing the incorrect %pf/%pF implementation is beyond the scope of this patch. Signed-off-by: Scott Wood <scottwood@freescale.com> Acked-by: Steven Rostedt <rostedt@goodmis.org> Cc: Dave Chinner <david@fromorbit.com> Link: http://lkml.kernel.org/r/20150831211637.GA12848@home.buserror.net Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
-rw-r--r--event-parse.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/event-parse.c b/event-parse.c
index bf96a063..e7a920fa 100644
--- a/event-parse.c
+++ b/event-parse.c
@@ -4889,8 +4889,8 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct event
else
ls = 2;
- if (*(ptr+1) == 'F' ||
- *(ptr+1) == 'f') {
+ if (*(ptr+1) == 'F' || *(ptr+1) == 'f' ||
+ *(ptr+1) == 'S' || *(ptr+1) == 's') {
ptr++;
show_func = *ptr;
} else if (*(ptr+1) == 'M' || *(ptr+1) == 'm') {