diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2016-06-21 17:15:45 -0400 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2016-06-22 09:01:48 -0400 |
| commit | 0b04b3dcdfb9aeb0e83c8ca322bf0830ee51ce38 (patch) | |
| tree | 183b7008d41ce1f5feb7c840a2540d93a830e9e6 /tools/perf/tests | |
| parent | 89c7cb2cad5e5e3675df3ba1c12fe2f64dc691d6 (diff) | |
perf evlist: Destructors should accept NULL
And do nothing, just like free(), to avoid having to test it in callers,
usually in error paths.
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-mexbavy0ft387j5w89t365eu@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/tests')
| -rw-r--r-- | tools/perf/tests/event-times.c | 3 | ||||
| -rw-r--r-- | tools/perf/tests/parse-no-sample-id-all.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/tools/perf/tests/event-times.c b/tools/perf/tests/event-times.c index 95fb744f6628..9f5698ac81ae 100644 --- a/tools/perf/tests/event-times.c +++ b/tools/perf/tests/event-times.c | |||
| @@ -200,8 +200,7 @@ static int test_times(int (attach)(struct perf_evlist *), | |||
| 200 | count.ena, count.run); | 200 | count.ena, count.run); |
| 201 | 201 | ||
| 202 | out_err: | 202 | out_err: |
| 203 | if (evlist) | 203 | perf_evlist__delete(evlist); |
| 204 | perf_evlist__delete(evlist); | ||
| 205 | return !err ? TEST_OK : TEST_FAIL; | 204 | return !err ? TEST_OK : TEST_FAIL; |
| 206 | } | 205 | } |
| 207 | 206 | ||
diff --git a/tools/perf/tests/parse-no-sample-id-all.c b/tools/perf/tests/parse-no-sample-id-all.c index 294c76b01b41..81c6eeaca0f5 100644 --- a/tools/perf/tests/parse-no-sample-id-all.c +++ b/tools/perf/tests/parse-no-sample-id-all.c | |||
| @@ -44,8 +44,7 @@ static int process_events(union perf_event **events, size_t count) | |||
| 44 | for (i = 0; i < count && !err; i++) | 44 | for (i = 0; i < count && !err; i++) |
| 45 | err = process_event(&evlist, events[i]); | 45 | err = process_event(&evlist, events[i]); |
| 46 | 46 | ||
| 47 | if (evlist) | 47 | perf_evlist__delete(evlist); |
| 48 | perf_evlist__delete(evlist); | ||
| 49 | 48 | ||
| 50 | return err; | 49 | return err; |
| 51 | } | 50 | } |
