Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752862AbdFSTiz (ORCPT ); Mon, 19 Jun 2017 15:38:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:45244 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752208AbdFSSeV (ORCPT ); Mon, 19 Jun 2017 14:34:21 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D29AB239AD Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=acme@kernel.org Date: Mon, 19 Jun 2017 15:34:03 -0300 From: Arnaldo Carvalho de Melo To: Taeung Song Cc: linux-kernel@vger.kernel.org, Jiri Olsa , Namhyung Kim Subject: Re: [PATCH v4 2/5] perf config: Refactor the code using 'ret' variable in cmd_config() Message-ID: <20170619183403.GA13640@kernel.org> References: <1497671202-20495-1-git-send-email-treeze.taeung@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1497671202-20495-1-git-send-email-treeze.taeung@gmail.com> X-Url: http://acmel.wordpress.com User-Agent: Mutt/1.8.0 (2017-02-23) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2779 Lines: 101 Em Sat, Jun 17, 2017 at 12:46:42PM +0900, Taeung Song escreveu: > To simplify the code related to 'ret' variable in cmd_config(), > initialize 'ret' with -1 instead of 0. Thanks, applied. > Cc: Jiri Olsa > Cc: Namhyung Kim > Signed-off-by: Taeung Song > --- > tools/perf/builtin-config.c | 30 +++++++++++++----------------- > 1 file changed, 13 insertions(+), 17 deletions(-) > > diff --git a/tools/perf/builtin-config.c b/tools/perf/builtin-config.c > index bb1be79..ece4558 100644 > --- a/tools/perf/builtin-config.c > +++ b/tools/perf/builtin-config.c > @@ -156,7 +156,7 @@ static int parse_config_arg(char *arg, char **var, char **value) > > int cmd_config(int argc, const char **argv) > { > - int i, ret = 0; > + int i, ret = -1; > struct perf_config_set *set; > char *user_config = mkpath("%s/.perfconfig", getenv("HOME")); > const char *config_filename; > @@ -186,10 +186,8 @@ int cmd_config(int argc, const char **argv) > * because of reinitializing with options config file location. > */ > set = perf_config_set__new(); > - if (!set) { > - ret = -1; > + if (!set) > goto out_err; > - } > > switch (actions) { > case ACTION_LIST: > @@ -197,10 +195,11 @@ int cmd_config(int argc, const char **argv) > pr_err("Error: takes no arguments\n"); > parse_options_usage(config_usage, config_options, "l", 1); > } else { > - ret = show_config(set); > - if (ret < 0) > + if (show_config(set) < 0) { > pr_err("Nothing configured, " > "please check your %s \n", config_filename); > + goto out_err; > + } > } > break; > default: > @@ -215,38 +214,35 @@ int cmd_config(int argc, const char **argv) > > if (!arg) { > pr_err("%s: strdup failed\n", __func__); > - ret = -1; > - break; > + goto out_err; > } > > if (parse_config_arg(arg, &var, &value) < 0) { > free(arg); > - ret = -1; > - break; > + goto out_err; > } > > if (value == NULL) { > - ret = show_spec_config(set, var); > - if (ret < 0) { > + if (show_spec_config(set, var) < 0) { > pr_err("%s is not configured: %s\n", > var, config_filename); > free(arg); > - break; > + goto out_err; > } > } else { > - ret = set_config(set, config_filename, var, value); > - if (ret < 0) { > + if (set_config(set, config_filename, var, value) < 0) { > pr_err("Failed to set '%s=%s' on %s\n", > var, value, config_filename); > free(arg); > - break; > + goto out_err; > } > } > free(arg); > } > } > > - perf_config_set__delete(set); > + ret = 0; > out_err: > + perf_config_set__delete(set); > return ret; > } > -- > 2.7.4