aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2012-09-12 14:39:59 -0400
committerArnaldo Carvalho de Melo <acme@redhat.com>2012-09-24 11:12:59 -0400
commitb85119200dfaf51d361008d986d591156c7473d4 (patch)
tree6105512ee93f5075cf47979f6e8c2d1531487666
parent87162d816f5f344d72e25249acd9b823b646a5c9 (diff)
tools lib traceevent: Fix afterlife gotos
Instead of dying, just use do_warning and let the goto that is there to take place. Reviewed-by: Namhyung Kim <namhyung@kernel.org> Cc: David Ahern <dsahern@gmail.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Mike Galbraith <efault@gmx.de> Cc: Namhyung Kim <namhyung@gmail.com> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Stephane Eranian <eranian@google.com> Cc: Steven Rostedt <rostedt@goodmis.org> Link: http://lkml.kernel.org/n/tip-aoaus46ngnt9oc2pt7ckot5d@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-rw-r--r--tools/lib/traceevent/event-parse.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c
index 2aeae5555a63..2091991691a6 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
1270 } 1270 }
1271 1271
1272 if (!field->type) { 1272 if (!field->type) {
1273 die("no type found"); 1273 do_warning("%s: no type found", __func__);
1274 goto fail; 1274 goto fail;
1275 } 1275 }
1276 field->name = last_token; 1276 field->name = last_token;
@@ -1317,7 +1317,7 @@ static int event_read_fields(struct event_format *event, struct format_field **f
1317 free_token(token); 1317 free_token(token);
1318 type = read_token(&token); 1318 type = read_token(&token);
1319 if (type == EVENT_NONE) { 1319 if (type == EVENT_NONE) {
1320 die("failed to find token"); 1320 do_warning("failed to find token");
1321 goto fail; 1321 goto fail;
1322 } 1322 }
1323 } 1323 }
@@ -1669,7 +1669,7 @@ process_op(struct event_format *event, struct print_arg *arg, char **tok)
1669 if (arg->type == PRINT_OP && !arg->op.left) { 1669 if (arg->type == PRINT_OP && !arg->op.left) {
1670 /* handle single op */ 1670 /* handle single op */
1671 if (token[1]) { 1671 if (token[1]) {
1672 die("bad op token %s", token); 1672 do_warning("bad op token %s", token);
1673 goto out_free; 1673 goto out_free;
1674 } 1674 }
1675 switch (token[0]) { 1675 switch (token[0]) {