From: Arnaldo Carvalho de Melo <a...@redhat.com>

Instead of dying, just use do_warning and let the goto that is there to
take place.

Cc: David Ahern <dsah...@gmail.com>
Cc: Frederic Weisbecker <fweis...@gmail.com>
Cc: Jiri Olsa <jo...@redhat.com>
Cc: Mike Galbraith <efa...@gmx.de>
Cc: Namhyung Kim <namhy...@gmail.com>
Cc: Paul Mackerras <pau...@samba.org>
Cc: Peter Zijlstra <pet...@infradead.org>
Cc: Stephane Eranian <eran...@google.com>
Cc: Steven Rostedt <rost...@goodmis.org>
Link: http://lkml.kernel.org/n/tip-aoaus46ngnt9oc2pt7cko...@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <a...@redhat.com>
---
 tools/lib/traceevent/event-parse.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/lib/traceevent/event-parse.c 
b/tools/lib/traceevent/event-parse.c
index 5e38d2f..ecc9a17 100644
--- a/tools/lib/traceevent/event-parse.c
+++ b/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;
                                }
                        }
@@ -1670,7 +1670,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]) {
-- 
1.7.9.2.358.g22243

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to