From patchwork Tue Jan 16 07:47:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Vladislav Valtchev (VMware)" X-Patchwork-Id: 10758477 Return-Path: linux-trace-devel-owner@vger.kernel.org Received: from mail-wm0-f65.google.com ([74.125.82.65]:36618 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750802AbeAPHry (ORCPT ); Tue, 16 Jan 2018 02:47:54 -0500 From: "Vladislav Valtchev (VMware)" To: rostedt@goodmis.org Cc: linux-trace-devel@vger.kernel.org, linux-kernel@vger.kernel.org, y.karadz@gmail.com, "Vladislav Valtchev (VMware)" Subject: [PATCH v3 2/3] trace-cmd: Remove the die() call from read_proc() Date: Tue, 16 Jan 2018 09:47:43 +0200 Message-Id: <20180116074744.5522-3-vladislav.valtchev@gmail.com> In-Reply-To: <20180116074744.5522-1-vladislav.valtchev@gmail.com> References: <20180116074744.5522-1-vladislav.valtchev@gmail.com> Sender: linux-trace-devel-owner@vger.kernel.org List-ID: As trace-stack.c's read_proc() function is going to be used by trace-cmd stat, we don't want it to make the program die in case something went wrong. Therefore, this simple patch makes read_proc() to just return -1 in case the proc file was empty or read() failed with an error, instead of using die(). Signed-off-by: Vladislav Valtchev (VMware) --- trace-stack.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/trace-stack.c b/trace-stack.c index c1058ca..d55d994 100644 --- a/trace-stack.c +++ b/trace-stack.c @@ -79,9 +79,9 @@ static int read_proc(int *status) n = read(fd, buf, sizeof(buf)); - /* We assume that the file is never empty we got no errors. */ + /* The file was empty or read() failed with an error. */ if (n <= 0) - die("error reading %s", PROC_FILE); + return -1; /* Does this file have more than 63 characters?? */ if (n >= sizeof(buf))