From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760643Ab3LIFfE (ORCPT ); Mon, 9 Dec 2013 00:35:04 -0500 Received: from LGEMRELSE7Q.lge.com ([156.147.1.151]:51889 "EHLO LGEMRELSE7Q.lge.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760060Ab3LIFeS (ORCPT ); Mon, 9 Dec 2013 00:34:18 -0500 X-AuditID: 9c930197-b7bdbae000000e78-7f-52a55657b7a4 From: Namhyung Kim To: Arnaldo Carvalho de Melo , Steven Rostedt Cc: Frederic Weisbecker , Ingo Molnar , Jiri Olsa , LKML , Namhyung Kim Subject: [PATCH 09/14] tools lib traceevent: Get rid of die() in add_right() Date: Mon, 9 Dec 2013 14:34:06 +0900 Message-Id: <1386567251-22751-10-git-send-email-namhyung@kernel.org> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1386567251-22751-1-git-send-email-namhyung@kernel.org> References: <1386567251-22751-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 Signed-off-by: Namhyung Kim --- tools/lib/traceevent/parse-filter.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/tools/lib/traceevent/parse-filter.c b/tools/lib/traceevent/parse-filter.c index 5efe66a682bd..a1ad609a860f 100644 --- a/tools/lib/traceevent/parse-filter.c +++ b/tools/lib/traceevent/parse-filter.c @@ -583,12 +583,18 @@ static int add_right(struct filter_arg *op, struct filter_arg *arg, op->str.type = op_type; op->str.field = left->field.field; op->str.val = strdup(str); - if (!op->str.val) - die("malloc string"); + if (!op->str.val) { + show_error(error_str, "Failed to allocate string filter"); + return -1; + } /* * Need a buffer to copy data for tests */ - op->str.buffer = malloc_or_die(op->str.field->size + 1); + op->str.buffer = malloc(op->str.field->size + 1); + if (op->str.buffer) { + show_error(error_str, "Failed to allocate string filter"); + return -1; + } /* Null terminate this buffer */ op->str.buffer[op->str.field->size] = 0; -- 1.7.11.7