From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org,
Arnaldo Carvalho de Melo <acme@redhat.com>,
Adrian Hunter <adrian.hunter@intel.com>,
David Ahern <dsahern@gmail.com>, Jiri Olsa <jolsa@kernel.org>,
Namhyung Kim <namhyung@kernel.org>,
Wang Nan <wangnan0@huawei.com>
Subject: [PATCH 12/15] perf symbols: dso->name is an array, no need to check it against NULL
Date: Mon, 13 Feb 2017 22:13:57 -0300 [thread overview]
Message-ID: <20170214011400.13352-13-acme@kernel.org> (raw)
In-Reply-To: <20170214011400.13352-1-acme@kernel.org>
From: Arnaldo Carvalho de Melo <acme@redhat.com>
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: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/map.c | 4 ++--
tools/perf/util/scripting-engines/trace-event-perl.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c
index 4f9a71c63026..0a943e7b1ea7 100644
--- a/tools/perf/util/map.c
+++ b/tools/perf/util/map.c
@@ -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;
}
diff --git a/tools/perf/util/scripting-engines/trace-event-perl.c b/tools/perf/util/scripting-engines/trace-event-perl.c
index 014ecd6f67c4..c1555fd0035a 100644
--- a/tools/perf/util/scripting-engines/trace-event-perl.c
+++ b/tools/perf/util/scripting-engines/trace-event-perl.c
@@ -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))) {
--
2.9.3
next prev parent reply other threads:[~2017-02-14 1:16 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-14 1:13 [GIT PULL 00/15] perf/core improvements and fixes Arnaldo Carvalho de Melo
2017-02-14 1:13 ` Arnaldo Carvalho de Melo
2017-02-14 1:13 ` [PATCH 01/15] tools include: Introduce linux/compiler-gcc.h Arnaldo Carvalho de Melo
2017-02-14 1:13 ` [PATCH 02/15] perf diff: Add 'delta-abs' compute method Arnaldo Carvalho de Melo
2017-02-14 1:13 ` [PATCH 03/15] perf diff: Add diff.order config option Arnaldo Carvalho de Melo
2017-02-14 1:13 ` [PATCH 04/15] perf diff: Add diff.compute " Arnaldo Carvalho de Melo
2017-02-14 1:13 ` [PATCH 05/15] perf diff: Change default setting to "delta-abs" Arnaldo Carvalho de Melo
2017-02-14 1:13 ` [PATCH 06/15] perf scripting perl: Fix compile error with some perl5 versions Arnaldo Carvalho de Melo
2017-02-14 1:13 ` [PATCH 07/15] tools lib traceevent: Initialize lenght on OLD_RING_BUFFER_TYPE_TIME_STAMP Arnaldo Carvalho de Melo
2017-02-14 1:13 ` [PATCH 08/15] tools lib traceevent plugin function: Initialize 'index' variable Arnaldo Carvalho de Melo
2017-02-14 1:13 ` [PATCH 09/15] perf evsel: Inform how to make a sysctl setting permanent Arnaldo Carvalho de Melo
2017-02-14 1:13 ` [PATCH 10/15] perf symbols: No need to check if sym->name is NULL Arnaldo Carvalho de Melo
2017-02-14 1:13 ` [PATCH 11/15] perf tests record: No need to test an array against NULL Arnaldo Carvalho de Melo
2017-02-14 1:13 ` Arnaldo Carvalho de Melo [this message]
2017-02-14 1:13 ` [PATCH 13/15] samples/bpf: Add missing header Arnaldo Carvalho de Melo
2017-02-14 1:13 ` [PATCH 14/15] samples/bpf: Ignore already processed ELF sections Arnaldo Carvalho de Melo
2017-02-14 1:14 ` [PATCH 15/15] samples/bpf: Reset global variables Arnaldo Carvalho de Melo
2017-02-14 6:31 ` [GIT PULL 00/15] perf/core improvements and fixes Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170214011400.13352-13-acme@kernel.org \
--to=acme@kernel.org \
--cc=acme@redhat.com \
--cc=adrian.hunter@intel.com \
--cc=dsahern@gmail.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=wangnan0@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.