From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932236AbaAGDBG (ORCPT ); Mon, 6 Jan 2014 22:01:06 -0500 Received: from LGEMRELSE6Q.lge.com ([156.147.1.121]:42663 "EHLO LGEMRELSE6Q.lge.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757129AbaAGDAT (ORCPT ); Mon, 6 Jan 2014 22:00:19 -0500 X-AuditID: 9c930179-b7c89ae000006438-c8-52cb6dc0b8be From: Namhyung Kim To: Steven Rostedt , Arnaldo Carvalho de Melo Cc: Frederic Weisbecker , Peter Zijlstra , Ingo Molnar , Namhyung Kim , LKML , Jiri Olsa Subject: [PATCH 4/5] tools lib traceevent: Get rid of malloc_or_die() in trace_seq_init() Date: Tue, 7 Jan 2014 12:00:11 +0900 Message-Id: <1389063612-18173-5-git-send-email-namhyung@kernel.org> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1389063612-18173-1-git-send-email-namhyung@kernel.org> References: <1389063612-18173-1-git-send-email-namhyung@kernel.org> X-Brightmail-Tracker: AAAAAA== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use plain malloc() and check its return value. Signed-off-by: Namhyung Kim --- tools/lib/traceevent/trace-seq.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/lib/traceevent/trace-seq.c b/tools/lib/traceevent/trace-seq.c index b139d55a6bf9..e858bfd3b104 100644 --- a/tools/lib/traceevent/trace-seq.c +++ b/tools/lib/traceevent/trace-seq.c @@ -46,8 +46,11 @@ void trace_seq_init(struct trace_seq *s) s->len = 0; s->readpos = 0; s->buffer_size = TRACE_SEQ_BUF_SIZE; - s->buffer = malloc_or_die(s->buffer_size); - s->state = TRACE_SEQ__GOOD; + s->buffer = malloc(s->buffer_size); + if (s->buffer != NULL) + s->state = TRACE_SEQ__GOOD; + else + s->state = TRACE_SEQ__MEM_ALLOC_FAILED; } /** -- 1.7.11.7