From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752140AbdFTI7l (ORCPT ); Tue, 20 Jun 2017 04:59:41 -0400 Received: from terminus.zytor.com ([65.50.211.136]:38231 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751739AbdFTI6O (ORCPT ); Tue, 20 Jun 2017 04:58:14 -0400 Date: Tue, 20 Jun 2017 01:56:05 -0700 From: tip-bot for Taeung Song Message-ID: Cc: linux-kernel@vger.kernel.org, acme@redhat.com, hpa@zytor.com, mingo@kernel.org, jolsa@kernel.org, treeze.taeung@gmail.com, tglx@linutronix.de, namhyung@kernel.org Reply-To: namhyung@kernel.org, tglx@linutronix.de, treeze.taeung@gmail.com, mingo@kernel.org, hpa@zytor.com, linux-kernel@vger.kernel.org, acme@redhat.com, jolsa@kernel.org In-Reply-To: <1494241650-32210-1-git-send-email-treeze.taeung@gmail.com> References: <1494241650-32210-1-git-send-email-treeze.taeung@gmail.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf config: Invert an if statement to reduce nesting in cmd_config() Git-Commit-ID: 8c1cedb4466809f9d741a4088314783cb88680a9 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: 8c1cedb4466809f9d741a4088314783cb88680a9 Gitweb: http://git.kernel.org/tip/8c1cedb4466809f9d741a4088314783cb88680a9 Author: Taeung Song AuthorDate: Mon, 8 May 2017 20:07:30 +0900 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 19 Jun 2017 15:14:58 -0300 perf config: Invert an if statement to reduce nesting in cmd_config() Signed-off-by: Taeung Song Cc: Jiri Olsa Cc: Namhyung Kim Link: http://lkml.kernel.org/r/1494241650-32210-1-git-send-email-treeze.taeung@gmail.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-config.c | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/tools/perf/builtin-config.c b/tools/perf/builtin-config.c index 80668fa..7545966 100644 --- a/tools/perf/builtin-config.c +++ b/tools/perf/builtin-config.c @@ -204,31 +204,33 @@ int cmd_config(int argc, const char **argv) } break; default: - if (argc) { - for (i = 0; argv[i]; i++) { - char *var, *value; - char *arg = strdup(argv[i]); - - if (!arg) { - pr_err("%s: strdup failed\n", __func__); - ret = -1; - break; - } + if (!argc) { + usage_with_options(config_usage, config_options); + break; + } - if (parse_config_arg(arg, &var, &value) < 0) { - free(arg); - ret = -1; - break; - } + for (i = 0; argv[i]; i++) { + char *var, *value; + char *arg = strdup(argv[i]); - if (value == NULL) - ret = show_spec_config(set, var); - else - ret = set_config(set, config_filename, var, value); + if (!arg) { + pr_err("%s: strdup failed\n", __func__); + ret = -1; + break; + } + + if (parse_config_arg(arg, &var, &value) < 0) { free(arg); + ret = -1; + break; } - } else - usage_with_options(config_usage, config_options); + + if (value == NULL) + ret = show_spec_config(set, var); + else + ret = set_config(set, config_filename, var, value); + free(arg); + } } perf_config_set__delete(set);