From 648d502ca414bc32d794674cd01a229b381cdfc6 Mon Sep 17 00:00:00 2001
From: Arnaldo Carvalho de Melo <acme@redhat.com>
Date: Wed, 12 Sep 2012 15:39:59 -0300
Subject: [PATCH] --- yaml --- r: 323882 b: refs/heads/master c:
 b85119200dfaf51d361008d986d591156c7473d4 h: refs/heads/master v: v3

---
 [refs]                                   | 2 +-
 trunk/tools/lib/traceevent/event-parse.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 12aed9d35902..b7135fe05b26 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 87162d816f5f344d72e25249acd9b823b646a5c9
+refs/heads/master: b85119200dfaf51d361008d986d591156c7473d4
diff --git a/trunk/tools/lib/traceevent/event-parse.c b/trunk/tools/lib/traceevent/event-parse.c
index 2aeae5555a63..2091991691a6 100644
--- a/trunk/tools/lib/traceevent/event-parse.c
+++ b/trunk/tools/lib/traceevent/event-parse.c
@@ -1270,7 +1270,7 @@ static int event_read_fields(struct event_format *event, struct format_field **f
 		}
 
 		if (!field->type) {
-			die("no type found");
+			do_warning("%s: no type found", __func__);
 			goto fail;
 		}
 		field->name = last_token;
@@ -1317,7 +1317,7 @@ static int event_read_fields(struct event_format *event, struct format_field **f
 				free_token(token);
 				type = read_token(&token);
 				if (type == EVENT_NONE) {
-					die("failed to find token");
+					do_warning("failed to find token");
 					goto fail;
 				}
 			}
@@ -1669,7 +1669,7 @@ process_op(struct event_format *event, struct print_arg *arg, char **tok)
 	if (arg->type == PRINT_OP && !arg->op.left) {
 		/* handle single op */
 		if (token[1]) {
-			die("bad op token %s", token);
+			do_warning("bad op token %s", token);
 			goto out_free;
 		}
 		switch (token[0]) {