perf symbols: dso->name is an array, no need to check it against NULL
tip-bot for Arnaldo Carvalho de Melo
merge botCommit-ID: 5eae7d842510d33d4410c062280eda6c935403dd Gitweb: http://git.kernel.org/tip/5eae7d842510d33d4410c062280eda6c935403dd Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Mon, 13 Feb 2017 17:11:03 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 13 Feb 2017 17:22:35 -0300
perf symbols: dso->name is an array, no need to check it against NULL
As it will always evaluate to 'true', as reported by clang:
util/map.c:390:36: error: address of array 'map->dso->name' will always evaluate to 'true' [-Werror,-Wpointer-bool-conversion]
if (map && map->dso && (map->dso->name || map->dso->long_name)) {
~~~~~~~~~~^~~~ ~~
util/map.c:393:22: error: address of array 'map->dso->name' will always evaluate to 'true' [-Werror,-Wpointer-bool-conversion]
else if (map->dso->name)
~~ ~~~~~~~~~~^~~~Cc Adrian Hunter <[email protected]>
Cc David Ahern <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Wang Nan <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/util/map.c | 4 ++-- tools/perf/util/scripting-engines/trace-event-perl.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
tools/perf/util/map.c +2 -2
@@ -387,10 +387,10 @@ size_t map__fprintf_dsoname(struct map *map, FILE *fp) {const char *dsoname ="[unknown]" ; -if (map && map->dso && (map->dso->name || map->dso->long_name)) { +if (map && map->dso) {if (symbol_conf.show_kernel_path && map->dso->long_name) dsoname = map->dso->long_name; -else if (map->dso->name) +else dsoname = map->dso->name; }
tools/perf/util/scripting-engines/trace-event-perl.c +2 -2
@@ -309,10 +309,10 @@ static SV *perl_process_callchain(struct perf_sample *sample,if (node->map) {struct map *map = node->map;const char *dsoname ="[unknown]" ; -if (map && map->dso && (map->dso->name || map->dso->long_name)) { +if (map && map->dso) {if (symbol_conf.show_kernel_path && map->dso->long_name) dsoname = map->dso->long_name; -else if (map->dso->name) +else dsoname = map->dso->name; }if (!hv_stores (elem,"dso" ,newSVpv (dsoname,0 ))) {