| Date | Tue, 14 Jan 2014 21:05:46 -0500 | From | Steven Rostedt <> | Subject | Re: [PATCH 03/17] tools lib traceevent: Get rid of malloc_or_die() in trace_seq_init() |
| |
On Wed, 15 Jan 2014 10:45:26 +0900 Namhyung Kim <namhyung@kernel.org> wrote:
> Use plain malloc() and check its return value. > > Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Acked-by: Steven Rostedt <rostedt@goodmis.org>
-- Steve
> --- > tools/lib/traceevent/trace-seq.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/tools/lib/traceevent/trace-seq.c b/tools/lib/traceevent/trace-seq.c > index 941d35d2cf87..339a0ffa21d5 100644 > --- a/tools/lib/traceevent/trace-seq.c > +++ b/tools/lib/traceevent/trace-seq.c > @@ -47,8 +47,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; > } > > /**
|