On Wed, Apr 29, 2020 at 10:11:01AM -0300, Arnaldo Carvalho de Melo wrote:
SNIP
> -int perf_evlist__add_sb_event(struct evlist **evlist,
> +int perf_evlist__add_sb_event(struct evlist *evlist,
> struct perf_event_attr *attr,
> perf_evsel__sb_cb_t cb,
> void *data)
> {
> struct evsel *evsel;
> - bool new_evlist = (*evlist) == NULL;
> -
> - if (*evlist == NULL)
> - *evlist = evlist__new();
> - if (*evlist == NULL)
> - return -1;
>
> if (!attr->sample_id_all) {
> pr_warning("enabling sample_id_all for all side band events\n");
> attr->sample_id_all = 1;
> }
>
> - evsel = perf_evsel__new_idx(attr, (*evlist)->core.nr_entries);
> + evsel = perf_evsel__new_idx(attr, evlist->core.nr_entries);
> if (!evsel)
> goto out_err;
we can return -1 right here
jirka
>
> evsel->side_band.cb = cb;
> evsel->side_band.data = data;
> - evlist__add(*evlist, evsel);
> + evlist__add(evlist, evsel);
> return 0;
> -
> out_err:
> - if (new_evlist) {
> - evlist__delete(*evlist);
> - *evlist = NULL;
> - }
> return -1;
> }
>
> diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h
> index f5bd5c386df1..0f02408fff3e 100644
> --- a/tools/perf/util/evlist.h
> +++ b/tools/perf/util/evlist.h
> @@ -107,7 +107,7 @@ int __perf_evlist__add_default_attrs(struct evlist
> *evlist,
>
> int perf_evlist__add_dummy(struct evlist *evlist);
>
> -int perf_evlist__add_sb_event(struct evlist **evlist,
> +int perf_evlist__add_sb_event(struct evlist *evlist,
> struct perf_event_attr *attr,
> perf_evsel__sb_cb_t cb,
> void *data);
> --
> 2.21.1
>
