lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Thu, 19 Mar 2020 14:10:50 -0000 From: "tip-bot2 for Jiri Olsa" <tip-bot2@...utronix.de> To: linux-tip-commits@...r.kernel.org Cc: Jiri Olsa <jolsa@...nel.org>, Andi Kleen <ak@...ux.intel.com>, Alexander Shishkin <alexander.shishkin@...ux.intel.com>, John Garry <john.garry@...wei.com>, Kajol Jain <kjain@...ux.ibm.com>, Michael Petlan <mpetlan@...hat.com>, Namhyung Kim <namhyung@...nel.org>, Peter Zijlstra <peterz@...radead.org>, Ravi Bangoria <ravi.bangoria@...ux.ibm.com>, Arnaldo Carvalho de Melo <acme@...hat.com>, x86 <x86@...nel.org>, LKML <linux-kernel@...r.kernel.org> Subject: [tip: perf/core] perf expr: Make expr__parse() return -1 on error The following commit has been merged into the perf/core branch of tip: Commit-ID: d942815a76463fa53b81d3d1c064f76bb3f80ead Gitweb: https://git.kernel.org/tip/d942815a76463fa53b81d3d1c064f76bb3f80ead Author: Jiri Olsa <jolsa@...nel.org> AuthorDate: Fri, 28 Feb 2020 10:36:16 +01:00 Committer: Arnaldo Carvalho de Melo <acme@...hat.com> CommitterDate: Mon, 09 Mar 2020 21:43:25 -03:00 perf expr: Make expr__parse() return -1 on error To match the error value of the expr__find_other function, so all exported expr functions return the same values: 0 on success, -1 on error. Signed-off-by: Jiri Olsa <jolsa@...nel.org> Reviewed-by: Andi Kleen <ak@...ux.intel.com> Cc: Alexander Shishkin <alexander.shishkin@...ux.intel.com> Cc: John Garry <john.garry@...wei.com> Cc: Kajol Jain <kjain@...ux.ibm.com> Cc: Michael Petlan <mpetlan@...hat.com> Cc: Namhyung Kim <namhyung@...nel.org> Cc: Peter Zijlstra <peterz@...radead.org> Cc: Ravi Bangoria <ravi.bangoria@...ux.ibm.com> Link: http://lore.kernel.org/lkml/20200228093616.67125-6-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@...hat.com> --- tools/perf/tests/expr.c | 4 ++-- tools/perf/util/expr.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/perf/tests/expr.c b/tools/perf/tests/expr.c index 755d73c..28313e5 100644 --- a/tools/perf/tests/expr.c +++ b/tools/perf/tests/expr.c @@ -45,11 +45,11 @@ int test__expr(struct test *t __maybe_unused, int subtest __maybe_unused) p = "FOO/0"; ret = expr__parse(&val, &ctx, p); - TEST_ASSERT_VAL("division by zero", ret == 1); + TEST_ASSERT_VAL("division by zero", ret == -1); p = "BAR/"; ret = expr__parse(&val, &ctx, p); - TEST_ASSERT_VAL("missing operand", ret == 1); + TEST_ASSERT_VAL("missing operand", ret == -1); TEST_ASSERT_VAL("find other", expr__find_other("FOO + BAR + BAZ + BOZO", "FOO", &other, &num_other) == 0); diff --git a/tools/perf/util/expr.c b/tools/perf/util/expr.c index 45b2553..fd192dd 100644 --- a/tools/perf/util/expr.c +++ b/tools/perf/util/expr.c @@ -54,7 +54,7 @@ __expr__parse(double *val, struct parse_ctx *ctx, const char *expr, int expr__parse(double *final_val, struct parse_ctx *ctx, const char *expr) { - return __expr__parse(final_val, ctx, expr, EXPR_PARSE); + return __expr__parse(final_val, ctx, expr, EXPR_PARSE) ? -1 : 0; } static bool
Powered by blists - more mailing lists