From 7834361a84f425358cce8ff5fc374f3b9ae53d05 Mon Sep 17 00:00:00 2001 From: Borislav Petkov Date: Wed, 21 Mar 2012 15:15:47 +0100 Subject: [PATCH] --- yaml --- r: 298330 b: refs/heads/master c: 842f07f6127afa48cca6b2ce9021b985e8eb9068 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/tools/perf/util/trace-event-parse.c | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 57acd4420dd7..580663cfcbc2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0d09eb7a9a2ca4d7ed32f7b440bea78c0622814a +refs/heads/master: 842f07f6127afa48cca6b2ce9021b985e8eb9068 diff --git a/trunk/tools/perf/util/trace-event-parse.c b/trunk/tools/perf/util/trace-event-parse.c index a4088ced1e64..dfd1bd8371a4 100644 --- a/trunk/tools/perf/util/trace-event-parse.c +++ b/trunk/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)