From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S941384AbcJXTFm (ORCPT ); Mon, 24 Oct 2016 15:05:42 -0400 Received: from terminus.zytor.com ([198.137.202.10]:47112 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932981AbcJXTFj (ORCPT ); Mon, 24 Oct 2016 15:05:39 -0400 Date: Mon, 24 Oct 2016 12:05:24 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: tglx@linutronix.de, mingo@kernel.org, hpa@zytor.com, acme@redhat.com, jolsa@kernel.org, adrian.hunter@intel.com, namhyung@kernel.org, linux-kernel@vger.kernel.org, wangnan0@huawei.com, dsahern@gmail.com Reply-To: namhyung@kernel.org, adrian.hunter@intel.com, dsahern@gmail.com, wangnan0@huawei.com, linux-kernel@vger.kernel.org, mingo@kernel.org, tglx@linutronix.de, jolsa@kernel.org, acme@redhat.com, hpa@zytor.com To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf tools: Normalize sq_quote_argv() error reporting Git-Commit-ID: e7b32d12a287a79f2831c1246baf3de0aed95dcc X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: e7b32d12a287a79f2831c1246baf3de0aed95dcc Gitweb: http://git.kernel.org/tip/e7b32d12a287a79f2831c1246baf3de0aed95dcc Author: Arnaldo Carvalho de Melo AuthorDate: Fri, 14 Oct 2016 17:57:11 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 24 Oct 2016 11:07:44 -0300 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 Cc: David Ahern Cc: Jiri Olsa Cc: Namhyung Kim Cc: Wang Nan Link: http://lkml.kernel.org/n/tip-as05b7mbogprlwi8iarwns8e@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/quote.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/util/quote.c b/tools/perf/util/quote.c index 639d1da..293534c 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; }