[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-842f07f6127afa48cca6b2ce9021b985e8eb9068@git.kernel.org>
Date: Fri, 23 Mar 2012 01:28:57 -0700
From: tip-bot for Borislav Petkov <bp@...64.org>
To: linux-tip-commits@...r.kernel.org
Cc: acme@...hat.com, linux-kernel@...r.kernel.org, hpa@...or.com,
mingo@...nel.org, tglx@...utronix.de, bp@...64.org
Subject: [tip:perf/urgent] perf tools: Simplify event_read_id exit path
Commit-ID: 842f07f6127afa48cca6b2ce9021b985e8eb9068
Gitweb: http://git.kernel.org/tip/842f07f6127afa48cca6b2ce9021b985e8eb9068
Author: Borislav Petkov <bp@...64.org>
AuthorDate: Wed, 21 Mar 2012 15:15:47 +0100
Committer: Arnaldo Carvalho de Melo <acme@...hat.com>
CommitDate: Thu, 22 Mar 2012 15:10:42 -0300
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@...64.org>
Link: http://lkml.kernel.org/r/1332339347-21342-1-git-send-email-bp@amd64.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@...hat.com>
---
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 a4088ce..dfd1bd8 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)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists