lkml.org 
[lkml]   [2010]   [May]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 4/5] perf probe: Don't call die()
    Date
    From: Arnaldo Carvalho de Melo <acme@redhat.com>

    Functions that were calling xzalloc also returned -1 when, for other
    reasons, it could fail, and the calleds are coping with failures, so
    stop using die() and xzalloc().

    Cc: Frédéric Weisbecker <fweisbec@gmail.com>
    Cc: Masami Hiramatsu <mhiramat@redhat.com>
    Cc: Mike Galbraith <efault@gmx.de>
    Cc: Paul Mackerras <paulus@samba.org>
    Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Cc: Tom Zanussi <tzanussi@gmail.com>
    LKML-Reference: <new-submission>
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    ---
    tools/perf/builtin-probe.c | 10 +++++++---
    1 files changed, 7 insertions(+), 3 deletions(-)

    diff --git a/tools/perf/builtin-probe.c b/tools/perf/builtin-probe.c
    index 61c6d70..e4a4da3 100644
    --- a/tools/perf/builtin-probe.c
    +++ b/tools/perf/builtin-probe.c
    @@ -65,8 +65,10 @@ static int parse_probe_event(const char *str)
    int ret;

    pr_debug("probe-definition(%d): %s\n", params.nevents, str);
    - if (++params.nevents == MAX_PROBES)
    - die("Too many probes (> %d) are specified.", MAX_PROBES);
    + if (++params.nevents == MAX_PROBES) {
    + pr_err("Too many probes (> %d) were specified.", MAX_PROBES);
    + return -1;
    + }

    /* Parse a perf-probe command into event */
    ret = parse_perf_probe_command(str, pev);
    @@ -84,7 +86,9 @@ static int parse_probe_event_argv(int argc, const char **argv)
    len = 0;
    for (i = 0; i < argc; i++)
    len += strlen(argv[i]) + 1;
    - buf = xzalloc(len + 1);
    + buf = zalloc(len + 1);
    + if (buf == NULL)
    + return -ENOMEM;
    len = 0;
    for (i = 0; i < argc; i++)
    len += sprintf(&buf[len], "%s ", argv[i]);
    --
    1.6.2.5
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2010-05-19 04:11    [W:0.023 / U:0.792 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site