lkml.org 
[lkml]   [2017]   [Feb]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 12/15] perf symbols: dso->name is an array, no need to check it against NULL
    Date
    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
    \
     
     \ /
      Last update: 2017-02-14 02:17    [W:5.914 / U:0.256 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site