Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b6bd9c7d authored by Scott Wood's avatar Scott Wood Committed by Arnaldo Carvalho de Melo
Browse files

tools lib traceevent: Support %ps/%pS 



Commits such as 65dd297a ("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: default avatarScott Wood <scottwood@freescale.com>
Acked-by: default avatarSteven Rostedt <rostedt@goodmis.org>
Cc: Dave Chinner <david@fromorbit.com>
Link: http://lkml.kernel.org/r/20150831211637.GA12848@home.buserror.net


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 4ba792e3

tools/lib/traceevent/event-parse.c

+2 −2
Original line number Diff line number Diff line
@@ -4905,8 +4905,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') {