From: Michel Normand <normand@fr.ibm.com>
Date: Mon, 18 May 2009 20:27:36 +0000 (+0200)
Subject: lxc-cgroup to return 255 in case of error
X-Git-Tag: lxc-2.1.1~3271
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=272bc5af96da4c4768083500ac9b15826ac55166;p=mirror_lxc.git

lxc-cgroup to return 255 in case of error

to have same exit code for all lxc commands

Signed-off-by: Michel Normand <normand@fr.ibm.com>
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
---

diff --git a/src/lxc/lxc_cgroup.c b/src/lxc/lxc_cgroup.c
index 6579e3616..5dfd6ac05 100644
--- a/src/lxc/lxc_cgroup.c
+++ b/src/lxc/lxc_cgroup.c
@@ -61,16 +61,14 @@ Options :\n\
 
 int main(int argc, char *argv[])
 {
-	int ret;
 	char *subsystem = NULL, *value = NULL;
 
-	ret = lxc_arguments_parse(&my_args, argc, argv);
-	if (ret)
-		return 1;
+	if (lxc_arguments_parse(&my_args, argc, argv))
+		return -1;
 
 	if (lxc_log_init(my_args.log_file, my_args.log_priority,
 			 my_args.progname, my_args.quiet))
-		return 1;
+		return -1;
 
 	subsystem = my_args.argv[0];
 
@@ -81,7 +79,7 @@ int main(int argc, char *argv[])
 		if (lxc_cgroup_set(my_args.name, subsystem, value)) {
 			ERROR("failed to assign '%s' value to '%s' for '%s'",
 				value, subsystem, my_args.name);
-			return 1;
+			return -1;
 		}
 	} else {
 		const unsigned long len = 4096;
@@ -89,7 +87,7 @@ int main(int argc, char *argv[])
 		if (lxc_cgroup_get(my_args.name, subsystem, buffer, len)) {
 			ERROR("failed to retrieve value of '%s' for '%s'",
 				subsystem, my_args.name);
-			return 1;
+			return -1;
 		}
 
 		printf("%s", buffer);