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 <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-x8cu007cly40kfp8xnpi9kya@git.kernel.orgSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 9ef6839b
...@@ -387,10 +387,10 @@ size_t map__fprintf_dsoname(struct map *map, FILE *fp) ...@@ -387,10 +387,10 @@ size_t map__fprintf_dsoname(struct map *map, FILE *fp)
{ {
const char *dsoname = "[unknown]"; 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) if (symbol_conf.show_kernel_path && map->dso->long_name)
dsoname = map->dso->long_name; dsoname = map->dso->long_name;
else if (map->dso->name) else
dsoname = map->dso->name; dsoname = map->dso->name;
} }
......
...@@ -309,10 +309,10 @@ static SV *perl_process_callchain(struct perf_sample *sample, ...@@ -309,10 +309,10 @@ static SV *perl_process_callchain(struct perf_sample *sample,
if (node->map) { if (node->map) {
struct map *map = node->map; struct map *map = node->map;
const char *dsoname = "[unknown]"; 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) if (symbol_conf.show_kernel_path && map->dso->long_name)
dsoname = map->dso->long_name; dsoname = map->dso->long_name;
else if (map->dso->name) else
dsoname = map->dso->name; dsoname = map->dso->name;
} }
if (!hv_stores(elem, "dso", newSVpv(dsoname,0))) { if (!hv_stores(elem, "dso", newSVpv(dsoname,0))) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment