1 files changed, 8 insertions, 2 deletions

diff --git a/parse-events.c b/parse-events.c
index 0c39dbf..eb3f230 100644
--- a/parse-events.c
+++ b/parse-events.c
@@ -1195,7 +1195,7 @@ process_op(struct event *event, struct print_arg *arg, char **tok)
 
                 right = malloc_or_die(sizeof(*right));
 
-                type = read_token(&token);
+                type = read_token_item(&token);
                 *tok = token;
 
                 /* could just be a type pointer */
@@ -1683,12 +1683,18 @@ process_arg_token(struct event *event, struct print_arg *arg,
 
 int event_read_print_args(struct event *event, struct print_arg **list)
 {
-        enum event_type type;
+        enum event_type type = EVENT_ERROR;
         struct print_arg *arg;
         char *token;
         int args = 0;
 
         do {
+                if (type == EVENT_NEWLINE) {
+                        free_token(token);
+                        type = read_token_item(&token);
+                        continue;
+                }
+
                 arg = malloc_or_die(sizeof(*arg));
                 memset(arg, 0, sizeof(*arg));