aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2016-10-14 17:57:11 -0300
committerArnaldo Carvalho de Melo <acme@redhat.com>2016-10-24 11:07:44 -0300
commite7b32d12a287a79f2831c1246baf3de0aed95dcc (patch)
treebda9f8eedf847d0579bc2de14e3dd43bd8ddcd2d
parentperf bench mem: Move boilerplate memory allocation to the infrastructure (diff)
downloadlinux-dev-e7b32d12a287a79f2831c1246baf3de0aed95dcc.tar.xz
linux-dev-e7b32d12a287a79f2831c1246baf3de0aed95dcc.zip
perf tools: Normalize sq_quote_argv() error reporting
It already returns whatever strbuf_(grow|addch)() returns in case of failure, so just return -ENOSPC in the only case where it was die()ing. When it returns, its only caller will call die() anyway, so no need to be so eager, die later. 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-as05b7mbogprlwi8iarwns8e@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-rw-r--r--tools/perf/util/quote.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/quote.c b/tools/perf/util/quote.c
index 639d1da2f978..293534c1a474 100644
--- a/tools/perf/util/quote.c
+++ b/tools/perf/util/quote.c
@@ -54,7 +54,7 @@ int sq_quote_argv(struct strbuf *dst, const char** argv, size_t maxlen)
break;
ret = sq_quote_buf(dst, argv[i]);
if (maxlen && dst->len > maxlen)
- die("Too many or long arguments");
+ return -ENOSPC;
}
return ret;
}