From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753966Ab2FRCyg (ORCPT ); Sun, 17 Jun 2012 22:54:36 -0400 Received: from LGEMRELSE1Q.lge.com ([156.147.1.111]:53084 "EHLO LGEMRELSE1Q.lge.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753770Ab2FRCye (ORCPT ); Sun, 17 Jun 2012 22:54:34 -0400 X-AuditID: 9c93016f-b7c35ae00000135b-a0-4fde9866280b From: Namhyung Kim To: Steven Rostedt , Arnaldo Carvalho de Melo Cc: Frederic Weisbecker , Peter Zijlstra , Ingo Molnar , LKML , Namhyung Kim Subject: [PATCH v2 1/5] tools lib traceevent: Replace malloc_or_die to plain calloc in alloc_event() Date: Mon, 18 Jun 2012 11:50:47 +0900 Message-Id: <1339987851-22491-1-git-send-email-namhyung@kernel.org> X-Mailer: git-send-email 1.7.10.2 X-Brightmail-Tracker: AAAAAA== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Namhyung Kim Because the only caller of the alloc_event() (pevent_parse_event) checks return value properly and all it does after allocation is initializing, it can be changed to use plain calloc. Thanks to Steven for suggesting this simpler way. Cc: Frederic Weisbecker Cc: Steven Rostedt Link: http://lkml.kernel.org/n/tip-wagq5qbdy1mytvjkrjbqt095@git.kernel.org Signed-off-by: Namhyung Kim --- tools/lib/traceevent/event-parse.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c index c471075e4974..4f667fdc5fae 100644 --- a/tools/lib/traceevent/event-parse.c +++ b/tools/lib/traceevent/event-parse.c @@ -619,12 +619,7 @@ void pevent_print_printk(struct pevent *pevent) static struct event_format *alloc_event(void) { - struct event_format *event; - - event = malloc_or_die(sizeof(*event)); - memset(event, 0, sizeof(*event)); - - return event; + return calloc(1, sizeof(struct event_format)); } static void add_event(struct pevent *pevent, struct event_format *event) -- 1.7.10.2