[tip:perf/core] tools lib traceevent: Replace malloc_or_die to plain malloc in alloc_event()

From: tip-bot for Namhyung Kim
Date: Fri Jul 06 2012 - 06:56:25 EST


Commit-ID: 50d8f9e393c5a1a8864fda75e3a9f2b800497a61
Gitweb: http://git.kernel.org/tip/50d8f9e393c5a1a8864fda75e3a9f2b800497a61
Author: Namhyung Kim <namhyung.kim@xxxxxxx>
AuthorDate: Mon, 11 Jun 2012 15:28:53 +0900
Committer: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
CommitDate: Fri, 29 Jun 2012 13:28:13 -0300

tools lib traceevent: Replace malloc_or_die to plain malloc in alloc_event()

Because the only caller of the alloc_event() (pevent_parse_event) checks
return value properly, it can be changed to use plain malloc.

Signed-off-by: Namhyung Kim <namhyung@xxxxxxxxxx>
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: Steven Rostedt <rostedt@xxxxxxxxxxx>
Link: http://lkml.kernel.org/r/1339396133-9839-1-git-send-email-namhyung@xxxxxxxxxx
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
---
tools/lib/traceevent/event-parse.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c
index b1abd39..83f0a8a 100644
--- a/tools/lib/traceevent/event-parse.c
+++ b/tools/lib/traceevent/event-parse.c
@@ -616,7 +616,9 @@ static struct event_format *alloc_event(void)
{
struct event_format *event;

- event = malloc_or_die(sizeof(*event));
+ event = malloc(sizeof(*event));
+ if (!event)
+ return NULL;
memset(event, 0, sizeof(*event));

return event;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/