perf tools: perf_header__read() shouldn't die()

And also don't call the constructor in it, this way it adheres
to the model the other methods follow.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
LKML-Reference: <1258649757-17554-1-git-send-email-acme@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 13 insertions, 4 deletions

diff --git a/tools/perf/builtin-timechart.c b/tools/perf/builtin-timechart.c
index 665877e4a944..dd4d82ac7aa4 100644
--- a/tools/perf/builtin-timechart.c
+++ b/tools/perf/builtin-timechart.c
@@ -1093,7 +1093,7 @@ static void process_samples(void)
 
 static int __cmd_timechart(void)
 {
-        int ret, rc = EXIT_FAILURE;
+        int err, rc = EXIT_FAILURE;
         unsigned long offset = 0;
         unsigned long head, shift;
         struct stat statbuf;
@@ -1111,8 +1111,8 @@ static int __cmd_timechart(void)
                 exit(-1);
         }
 
-        ret = fstat(input, &statbuf);
-        if (ret < 0) {
+        err = fstat(input, &statbuf);
+        if (err < 0) {
                 perror("failed to stat file");
                 exit(-1);
         }
@@ -1122,7 +1122,16 @@ static int __cmd_timechart(void)
                 exit(0);
         }
 
-        header = perf_header__read(input);
+        header = perf_header__new();
+        if (header == NULL)
+                return -ENOMEM;
+
+        err = perf_header__read(header, input);
+        if (err < 0) {
+                perf_header__delete(header);
+                return err;
+        }
+
         head = header->data_offset;
 
         sample_type = perf_header__sample_type(header);