Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5eae7d84 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

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.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 9ef6839b

tools/perf/util/map.c

+2 −2
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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))) {