From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751579Ab2FMFvZ (ORCPT ); Wed, 13 Jun 2012 01:51:25 -0400 Received: from LGEMRELSE1Q.lge.com ([156.147.1.111]:46649 "EHLO LGEMRELSE1Q.lge.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750778Ab2FMFvY (ORCPT ); Wed, 13 Jun 2012 01:51:24 -0400 X-AuditID: 9c93016f-b7c3cae000001954-bd-4fd82a594be4 From: Namhyung Kim To: Arnaldo Carvalho de Melo , Steven Rostedt Cc: Peter Zijlstra , Paul Mackerras , Ingo Molnar , LKML , Namhyung Kim , Frederic Weisbecker Subject: Re: [PATCH] tools lib traceevent: Replace malloc_or_die to plain malloc in alloc_event() References: <1339396133-9839-1-git-send-email-namhyung@kernel.org> Date: Wed, 13 Jun 2012 14:48:27 +0900 In-Reply-To: <1339396133-9839-1-git-send-email-namhyung@kernel.org> (Namhyung Kim's message of "Mon, 11 Jun 2012 15:28:53 +0900") Message-ID: <87aa0769uc.fsf@sejong.aot.lge.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.95 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Brightmail-Tracker: AAAAAA== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, Steve Could you take a look at this too? On Mon, 11 Jun 2012 15:28:53 +0900, Namhyung Kim wrote: > From: Namhyung Kim > > 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 > Cc: Steven Rostedt > Signed-off-by: Namhyung Kim > --- > 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)); > > return event;