Re: [PATCH] tools lib traceevent: Replace malloc_or_die to plainmalloc in alloc_event()
From: Steven Rostedt
Date: Thu Jun 14 2012 - 23:30:53 EST
On Mon, 2012-06-11 at 15:28 +0900, Namhyung Kim wrote:
> From: Namhyung Kim <namhyung.kim@xxxxxxx>
>
> 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@xxxxxxxxx>
> Cc: Steven Rostedt <rostedt@xxxxxxxxxxx>
> Signed-off-by: Namhyung Kim <namhyung@xxxxxxxxxx>
> ---
> 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));
}
-- Steve
>
> 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/