Merge branch 'trace-cmd' into trace-view

1 files changed, 13 insertions, 2 deletions

diff --git a/parse-events.c b/parse-events.c
index 0600973..9bbb401 100644
--- a/parse-events.c
+++ b/parse-events.c
@@ -270,7 +270,7 @@ static int func_map_init(struct pevent *pevent)
         struct func_map *func_map;
         int i;
 
-        func_map = malloc_or_die(sizeof(*func_map) * pevent->func_count + 1);
+        func_map = malloc_or_die(sizeof(*func_map) * (pevent->func_count + 1));
         funclist = pevent->funclist;
 
         i = 0;
@@ -420,7 +420,7 @@ static void printk_map_init(struct pevent *pevent)
         struct printk_map *printk_map;
         int i;
 
-        printk_map = malloc_or_die(sizeof(*printk_map) * pevent->printk_count + 1);
+        printk_map = malloc_or_die(sizeof(*printk_map) * (pevent->printk_count + 1));
 
         printklist = pevent->printklist;
 
@@ -3067,6 +3067,17 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct event
                                                 break;
                                         }
                                 }
+                                if (pevent->long_size == 8 && ls) {
+                                        char *p;
+
+                                        ls = 2;
+                                        /* make %l into %ll */
+                                        p = strchr(format, 'l');
+                                        if (p)
+                                                memmove(p+1, p, strlen(p)+1);
+                                        else if (strcmp(format, "%p") == 0)
+                                                strcpy(format, "0x%llx");
+                                }
                                 switch (ls) {
                                 case 0:
                                         trace_seq_printf(s, format, (int)val);