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

BugLink: http://bugs.launchpad.net/bugs/1774063
[ Upstream commit 38d70b7ca1769f26c0b79f3c08ff2cc949712b59 ]

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: Steven Rostedt <rostedt@goodmis.org>
Acked-by: Namhyung Kim <namhyung@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Link: http://lkml.kernel.org/r/20180112004822.260262257@goodmis.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>

diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c
index 7ce724fc054478c923605385fd00d8471de831e6..9a17bc27296ecaf0b439812e83e61c0c08f0f36e 100644 (file)
--- a/tools/lib/traceevent/event-parse.c
+++ b/tools/lib/traceevent/event-parse.c
@@ -4949,21 +4949,22 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct event
                                else
                                        ls = 2;
 
-                               if (*(ptr+1) == 'F' || *(ptr+1) == 'f' ||
-                                   *(ptr+1) == 'S' || *(ptr+1) == 's') {
+                               if (isalnum(ptr[1]))
                                        ptr++;
+
+                               if (*ptr == 'F' || *ptr == 'f' ||
+                                   *ptr == 'S' || *ptr == 's') {
                                        show_func = *ptr;
-                               } else if (*(ptr+1) == 'M' || *(ptr+1) == 'm') {
-                                       print_mac_arg(s, *(ptr+1), data, size, event, arg);
-                                       ptr++;
+                               } else if (*ptr == 'M' || *ptr == 'm') {
+                                       print_mac_arg(s, *ptr, data, size, event, arg);
                                        arg = arg->next;
                                        break;
-                               } else if (*(ptr+1) == 'I' || *(ptr+1) == 'i') {
+                               } else if (*ptr == 'I' || *ptr == 'i') {
                                        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) {
-                                               ptr += n;
+                                               ptr += n - 1;
                                                arg = arg->next;
                                                break;
                                        }