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.c...@huawei.com>
Acked-by: Ivana Hutarova Varekova <varek...@redhat.com>
---
src/tools/cgconfig.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/tools/cgconfig.c b/src/tools/cgconfig.c
index 81d07c9..900c235 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;
}
--
1.7.1
------------------------------------------------------------------------------
Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more!
Discover the easy way to master current and previous Microsoft technologies
and advance your career. Get an incredible 1,500+ hours of step-by-step
tutorial videos with LearnDevNow. Subscribe today and save!
http://pubads.g.doubleclick.net/gampad/clk?id=58041391&iu=/4140/ostg.clktrk
_______________________________________________
Libcg-devel mailing list
Libcg-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/libcg-devel
