From: Libo Chen <libo.chen@huawei.com>
Date: Tue, 10 Sep 2013 06:18:32 +0000 (+0200)
Subject: cgconfig: fix the excursive processing
X-Git-Tag: v0.41~43
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2aacf774602fa1b972d97503036b935ffeed6be1;p=thirdparty%2Flibcgroup.git

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 <clbchenlibo.chen@huawei.com>
Acked-by: Ivana Hutarova Varekova <varekova@redhat.com>
---

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