Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1670192

[PATCH 03/23] perf config: Invert an if statement to reduce nesting in cmd_config()

Show all headers | View raw

From: Taeung Song <treeze.taeung@gmail.com>

Signed-off-by: Taeung Song <treeze.taeung@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: http://lkml.kernel.org/r/1494241650-32210-1-git-send-email-treeze.taeung@gmail.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 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 80668fa7556e..75459668edb2 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);
-- 
2.9.4

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[GIT PULL 00/23] perf/core improvements and fixes Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-06-20 04:00 +0200
  [PATCH 09/23] tools: Adopt noinline from kernel sources Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-06-20 04:00 +0200
  [PATCH 11/23] tools: Adopt __aligned from kernel sources Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-06-20 04:00 +0200
  [PATCH 08/23] perf tools: Use __maybe_unused consistently Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-06-20 04:00 +0200
  [PATCH 05/23] tools: Adopt __noreturn from kernel sources Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-06-20 04:00 +0200
  [PATCH 18/23] perf ftrace: Show error message when fails to set ftrace files Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-06-20 04:00 +0200
  [PATCH 03/23] perf config: Invert an if statement to reduce nesting in cmd_config() Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-06-20 04:00 +0200
  [PATCH 19/23] perf ftrace: Move setup_pager before opening trace_pipe Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-06-20 04:00 +0200
  [PATCH 13/23] perf intel-pt/bts: Remove unused SAMPLE_SIZE defines and bts priv array Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-06-20 04:00 +0200
  [PATCH 12/23] perf coresight: Remove superfluous check before use Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-06-20 04:10 +0200
  [PATCH 06/23] tools: Adopt __printf from kernel sources Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-06-20 04:10 +0200
  [PATCH 17/23] perf script: Support -F brstackoff,dso Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-06-20 04:10 +0200
  Re: [GIT PULL 00/23] perf/core improvements and fixes Ingo Molnar <mingo@kernel.org> - 2017-06-20 11:00 +0200

csiph-web