Messages in this thread | | | From | Namhyung Kim <> | Subject | Re: [PATCH] tools lib traceevent: Replace malloc_or_die to plain malloc in alloc_event() | Date | Fri, 15 Jun 2012 17:45:32 +0900 |
| |
Hi,
On Thu, 14 Jun 2012 23:30:57 -0400, Steven Rostedt wrote: > On Mon, 2012-06-11 at 15:28 +0900, Namhyung Kim wrote: >> From: Namhyung Kim <namhyung.kim@lge.com> >> >> Because the only caller of the alloc_event() >> (pevent_parse_event) checks return value properly, >> it can be changed to use plain malloc. >> >> Cc: Frederic Weisbecker <fweisbec@gmail.com> >> Cc: Steven Rostedt <rostedt@goodmis.org> >> Signed-off-by: Namhyung Kim <namhyung@kernel.org> >> --- >> tools/lib/traceevent/event-parse.c | 4 +++- >> 1 file changed, 3 insertions(+), 1 deletion(-) >> >> diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c >> index c471075e4974..a6b5bcdc5580 100644 >> --- a/tools/lib/traceevent/event-parse.c >> +++ b/tools/lib/traceevent/event-parse.c >> @@ -621,7 +621,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)); > > Perhaps we should combined these to: > > { > struct event_format *event; > > event = calloc(1, sizeof(*event)); > return event; > } > > Or even: > > { > return calloc(1, sizeof(struct event_format)); > } >
Ok, I'll take this. Thanks. Namhyung
| |