lkml.org 
[lkml]   [2018]   [Jan]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH v3 2/3] trace-cmd: Remove the die() call from read_proc()
Date
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) <vladislav.valtchev@gmail.com>
---
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))
--
2.14.1
\
 
 \ /
  Last update: 2018-01-16 08:48    [W:0.064 / U:3.084 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site