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