Skip to content

Commit

Permalink
tools lib traceevent: Fix afterlife gotos
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Arnaldo Carvalho de Melo committed Sep 24, 2012
1 parent 87162d8 commit b851192
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions tools/lib/traceevent/event-parse.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
}
Expand Down Expand Up @@ -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]) {
Expand Down

0 comments on commit b851192

Please sign in to comment.