fix bprintk printing

The handling of bprintk was broken in more ways than one.
This fixes those issues.

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

1 files changed, 6 insertions, 8 deletions

diff --git a/parse-events.c b/parse-events.c
index b802be7..3581214 100644
--- a/parse-events.c
+++ b/parse-events.c
@@ -304,18 +304,16 @@ void parse_ftrace_printk(char *file, unsigned int size)
         char *line;
         char *next;
         char *addr_str;
-        int ret;
+        char *fmt;
         int i;
 
         line = strtok_r(file, "\n", &next);
         while (line) {
                 item = malloc_or_die(sizeof(*item));
-                ret = sscanf(line, "%as : %as",
-                             &addr_str,
-                             &item->printk);
+                addr_str = strtok_r(line, ":", &fmt);
                 item->addr = strtoull(addr_str, NULL, 16);
-                free(addr_str);
-
+                /* fmt still has a space, skip it */
+                item->printk = strdup(fmt+1);
                 item->next = list;
                 list = item;
                 line = strtok_r(NULL, "\n", &next);
@@ -2192,8 +2190,8 @@ static struct print_arg *make_bprint_args(char *fmt, void *data, int size, struc
                         case 'u':
                         case 'x':
                         case 'i':
-                                bptr = (void *)(((unsigned long)bptr + (long_size - 1)) &
-                                                ~(long_size - 1));
+                                bptr = (void *)(((unsigned long)bptr + 3) &
+                                                ~3);
                                 switch (ls) {
                                 case 0:
                                 case 1: