forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tools lib traceevent: Cleanup realloc use

Browse source 
The if branch is completely unnecessary since 'realloc' can handle
NULL pointers for the first parameter.

This patch is just an adoption of Ulrich Drepper's recent patch on
perf tools.

Signed-off-by: Namhyung Kim <namhyung.kim@lge.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ulrich Drepper <drepper@gmail.com>
Link: http://lkml.kernel.org/r/1335230984-7613-1-git-send-email-namhyung.kim@lge.com
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
This commit is contained in:
Namhyung Kim 2012-04-24 10:29:44 +09:00 • committed by Namhyung Kim
commit f6ced60fb6
2 changed files with 10 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tools/lib/traceevent/event-parse.c
View file

@ -633,11 +633,7 @@ static void add_event(struct pevent *pevent, struct event_format *event)
{ {
int i; int i;
if (!pevent->events) pevent->events = realloc(pevent->events, sizeof(event) *
pevent->events = malloc_or_die(sizeof(event));
else
pevent->events =
realloc(pevent->events, sizeof(event) *
(pevent->nr_events + 1)); (pevent->nr_events + 1));
if (!pevent->events) if (!pevent->events)
die("Can not allocate events"); die("Can not allocate events");

14
tools/lib/traceevent/parse-filter.c
View file

@ -148,17 +148,11 @@ add_filter_type(struct event_filter *filter, int id)
if (filter_type) if (filter_type)
return filter_type; return filter_type;
if (!filter->filters) filter->event_filters = realloc(filter->event_filters,
filter->event_filters =
malloc_or_die(sizeof(*filter->event_filters));
else {
filter->event_filters =
realloc(filter->event_filters,
sizeof(*filter->event_filters) * sizeof(*filter->event_filters) *
(filter->filters + 1)); (filter->filters + 1));
if (!filter->event_filters) if (!filter->event_filters)
die("Could not allocate filter"); die("Could not allocate filter");
}
for (i = 0; i < filter->filters; i++) { for (i = 0; i < filter->filters; i++) {
if (filter->event_filters[i].event_id > id) if (filter->event_filters[i].event_id > id)
@ -1480,7 +1474,7 @@ void pevent_filter_clear_trivial(struct event_filter *filter,
{ {
struct filter_type *filter_type; struct filter_type *filter_type;
int count = 0; int count = 0;
int *ids; int *ids = NULL;
int i; int i;
if (!filter->filters) if (!filter->filters)
@ -1504,10 +1498,8 @@ void pevent_filter_clear_trivial(struct event_filter *filter,
default: default:
break; break;
} }
if (count)
ids = realloc(ids, sizeof(*ids) * (count + 1)); ids = realloc(ids, sizeof(*ids) * (count + 1));
else
ids = malloc(sizeof(*ids));
if (!ids) if (!ids)
die("Can't allocate ids"); die("Can't allocate ids");
ids[count++] = filter_type->event_id; ids[count++] = filter_type->event_id;