lkml.org 
[lkml]   [2016]   [Feb]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:perf/core] perf tools: Fix checking asprintf return value
    Commit-ID:  26dee028d365fbc0e3326606a8520260b4462381
    Gitweb: http://git.kernel.org/tip/26dee028d365fbc0e3326606a8520260b4462381
    Author: Wang Nan <wangnan0@huawei.com>
    AuthorDate: Fri, 19 Feb 2016 11:43:52 +0000
    Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
    CommitDate: Fri, 19 Feb 2016 19:12:47 -0300

    perf tools: Fix checking asprintf return value

    According to man pages, asprintf returns -1 when failure. This patch
    fixes two incorrect return value checker.

    Signed-off-by: Wang Nan <wangnan0@huawei.com>
    Cc: Adrian Hunter <adrian.hunter@intel.com>
    Cc: Alexei Starovoitov <ast@kernel.org>
    Cc: Brendan Gregg <brendan.d.gregg@gmail.com>
    Cc: Cody P Schafer <dev@codyps.com>
    Cc: He Kuang <hekuang@huawei.com>
    Cc: Jeremie Galarneau <jeremie.galarneau@efficios.com>
    Cc: Jiri Olsa <jolsa@kernel.org>
    Cc: Kirill Smelkov <kirr@nexedi.com>
    Cc: Li Zefan <lizefan@huawei.com>
    Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
    Cc: Namhyung Kim <namhyung@kernel.org>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Zefan Li <lizefan@huawei.com>
    Cc: pi3orama@163.com
    Cc: stable@vger.kernel.org # v4.4+
    Fixes: ffeb883e5662 ("perf tools: Show proper error message for wrong terms of hw/sw events")
    Link: http://lkml.kernel.org/r/1455882283-79592-5-git-send-email-wangnan0@huawei.com
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    ---
    tools/perf/util/parse-events.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
    index e5583fd..72524c7 100644
    --- a/tools/perf/util/parse-events.c
    +++ b/tools/perf/util/parse-events.c
    @@ -2110,11 +2110,11 @@ char *parse_events_formats_error_string(char *additional_terms)

    /* valid terms */
    if (additional_terms) {
    - if (!asprintf(&str, "valid terms: %s,%s",
    - additional_terms, static_terms))
    + if (asprintf(&str, "valid terms: %s,%s",
    + additional_terms, static_terms) < 0)
    goto fail;
    } else {
    - if (!asprintf(&str, "valid terms: %s", static_terms))
    + if (asprintf(&str, "valid terms: %s", static_terms) < 0)
    goto fail;
    }
    return str;
    \
     
     \ /
      Last update: 2016-02-20 12:41    [W:4.064 / U:0.108 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site