redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

perf config: Refactor the code using 'ret' variable in cmd_config() 

To simplify the code related to 'ret' variable in cmd_config(),
initialize 'ret' with -1 instead of 0 and use goto to perform resource
release at the end of the function, setting ret to zero just before the
out_err label, as usual in the kernel sources.

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/1497671202-20495-1-git-send-email-treeze.taeung@gmail.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
hifive-unleashed-5.1
Taeung Song 2017-06-17 12:46:42 +09:00 committed by Arnaldo Carvalho de Melo
parent 4f1fd74283
commit dfe1c6d7ef
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
tools/perf/builtin-config.c
View File

@ -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;
}