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

Commit 38d70b7c authored by Steven Rostedt (VMware)'s avatar Steven Rostedt (VMware) Committed by Arnaldo Carvalho de Melo
Browse files

tools lib traceevent: Simplify pointer print logic and fix %pF 



When processing %pX in pretty_print(), simplify the logic slightly by
incrementing the ptr to the format string if isalnum(ptr[1]) is true.
This follows the logic a bit more closely to what is in the kernel.

Also, this fixes a small bug where %pF was not giving the offset of the
function.

Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
Acked-by: default avatarNamhyung Kim <namhyung@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Link: http://lkml.kernel.org/r/20180112004822.260262257@goodmis.org


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

tools/lib/traceevent/event-parse.c

+9 −8
Original line number Original line Diff line number Diff line
@@ -4956,21 +4956,22 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct event 
				else

				else

					ls = 2;

					ls = 2;





				if (*(ptr+1) == 'F' || *(ptr+1) == 'f' ||

				if (isalnum(ptr[1]))

				    *(ptr+1) == 'S' || *(ptr+1) == 's') {

					ptr++;

					ptr++;



				if (*ptr == 'F' || *ptr == 'f' ||

				    *ptr == 'S' || *ptr == 's') {

					show_func = *ptr;

					show_func = *ptr;

				} else if (*(ptr+1) == 'M' || *(ptr+1) == 'm') {

				} else if (*ptr == 'M' || *ptr == 'm') {

					print_mac_arg(s, *(ptr+1), data, size, event, arg);

					print_mac_arg(s, *ptr, data, size, event, arg);

					ptr++;

					arg = arg->next;

					arg = arg->next;

					break;

					break;

				} else if (*(ptr+1) == 'I' || *(ptr+1) == 'i') {

				} else if (*ptr == 'I' || *ptr == 'i') {

					int n;

					int n;





					n = print_ip_arg(s, ptr+1, data, size, event, arg);

					n = print_ip_arg(s, ptr, data, size, event, arg);

					if (n > 0) {

					if (n > 0) {

						ptr += n;

						ptr += n - 1;

						arg = arg->next;

						arg = arg->next;

						break;

						break;

					}

					}