tools lib traceevent: Get rid of malloc_or_die() in trace_seq_init()
authorNamhyung Kim <namhyung@kernel.org>
Wed, 15 Jan 2014 01:45:26 +0000 (10:45 +0900)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Wed, 15 Jan 2014 18:10:32 +0000 (15:10 -0300)
Use plain malloc() and check its return value.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Reviewed-by: Jiri Olsa <jolsa@redhat.com>
Acked-by: Steven Rostedt <rostedt@goodmis.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung.kim@lge.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/1389750340-15965-4-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/lib/traceevent/trace-seq.c

index e454a2c66cac5934165e012f03125d30f8fb0230..ec3bd16a548881252d482e3f09e499a9bd12898d 100644 (file)
@@ -57,8 +57,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;
 }
 
 /**