projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3026bba
)
tools lib traceevent: Get rid of malloc_or_die() in trace_seq_init()
author
Namhyung Kim
<
[email protected]
>
Wed, 15 Jan 2014 01:45:26 +0000
(10:45 +0900)
committer
Arnaldo Carvalho de Melo
<
[email protected]
>
Wed, 15 Jan 2014 18:10:32 +0000
(15:10 -0300)
Use plain malloc() and check its return value.
Signed-off-by: Namhyung Kim <
[email protected]
>
Reviewed-by: Jiri Olsa <
[email protected]
>
Acked-by: Steven Rostedt <
[email protected]
>
Cc: Frederic Weisbecker <
[email protected]
>
Cc: Ingo Molnar <
[email protected]
>
Cc: Jiri Olsa <
[email protected]
>
Cc: Namhyung Kim <
[email protected]
>
Cc: Peter Zijlstra <
[email protected]
>
Cc: Steven Rostedt <
[email protected]
>
Link:
http://lkml.kernel.org/r/
[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <
[email protected]
>
tools/lib/traceevent/trace-seq.c
patch
|
blob
|
history
diff --git
a/tools/lib/traceevent/trace-seq.c
b/tools/lib/traceevent/trace-seq.c
index e454a2c66cac5934165e012f03125d30f8fb0230..ec3bd16a548881252d482e3f09e499a9bd12898d 100644
(file)
--- a/
tools/lib/traceevent/trace-seq.c
+++ b/
tools/lib/traceevent/trace-seq.c
@@
-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;
}
/**