diff options
| author |   Borislav Petkov <bp@amd64.org> | 2012-03-21 15:15:47 +0100 |
|---|---|---|
| committer |   Arnaldo Carvalho de Melo <acme@redhat.com> | 2012-03-22 15:10:42 -0300 |
| commit | 842f07f6127afa48cca6b2ce9021b985e8eb9068 (patch) | |
| tree | f9354ae650cdc2f7ced7cf99e10063b94484fb18 | |
| parent | Merge branch 'perf/urgent' into perf/core (diff) | |
| download | linux-dev-842f07f6127afa48cca6b2ce9021b985e8eb9068.tar.xz linux-dev-842f07f6127afa48cca6b2ce9021b985e8eb9068.zip | |
perf tools: Simplify event_read_id exit path
We're freeing the token in any case so simplify the exit path by
unifying it.
No functional change.
Signed-off-by: Borislav Petkov <bp@amd64.org>
Link: http://lkml.kernel.org/r/1332339347-21342-1-git-send-email-bp@amd64.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
| -rw-r--r-- | tools/perf/util/trace-event-parse.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/tools/perf/util/trace-event-parse.c b/tools/perf/util/trace-event-parse.c index a4088ced1e64..dfd1bd8371a4 100644 --- a/tools/perf/util/trace-event-parse.c +++ b/tools/perf/util/trace-event-parse.c @@ -722,7 +722,7 @@ static char *event_read_name(void) static int event_read_id(void) { char *token; - int id; + int id = -1; if (read_expected_item(EVENT_ITEM, "ID") < 0) return -1; @@ -731,15 +731,13 @@ static int event_read_id(void) return -1; if (read_expect_type(EVENT_ITEM, &token) < 0) - goto fail; + goto free; id = strtoul(token, NULL, 0); - free_token(token); - return id; - fail: + free: free_token(token); - return -1; + return id; } static int field_is_string(struct format_field *field) |