From 2aacf774602fa1b972d97503036b935ffeed6be1 Mon Sep 17 00:00:00 2001 From: Libo Chen Date: Tue, 10 Sep 2013 08:18:32 +0200 Subject: [PATCH] cgconfig: fix the excursive processing error and ret should be unified v4: - use error for cgroup_string_list_add_item goto err lable instead of exit Signed-off-by: Libo Chen Acked-by: Ivana Hutarova Varekova --- src/tools/cgconfig.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/tools/cgconfig.c b/src/tools/cgconfig.c index 81d07c99..900c2354 100644 --- a/src/tools/cgconfig.c +++ b/src/tools/cgconfig.c @@ -98,11 +98,11 @@ int main(int argc, char *argv[]) usage(argv[0]); break; case 'l': - ret = cgroup_string_list_add_item(&cfg_files, optarg); - if (ret) { + error = cgroup_string_list_add_item(&cfg_files, optarg); + if (error) { fprintf(stderr, "%s: cannot add file to list,"\ " out of memory?\n", argv[0]); - exit(1); + goto err; } break; case 'L': @@ -153,7 +153,7 @@ int main(int argc, char *argv[]) error = cgroup_set_uid_gid(default_group, tuid, tgid, auid, agid); if (error) { fprintf(stderr, "%s: cannot set default UID and GID: %s\n", - argv[0], cgroup_strerror(ret)); + argv[0], cgroup_strerror(error)); goto err; } @@ -165,7 +165,7 @@ int main(int argc, char *argv[]) error = cgroup_config_set_default(default_group); if (error) { fprintf(stderr, "%s: cannot set config parser defaults: %s\n", - argv[0], cgroup_strerror(ret)); + argv[0], cgroup_strerror(error)); goto err; } -- 2.47.2