From: Michel Normand <normand@fr.ibm.com>
Date: Mon, 18 May 2009 20:27:35 +0000 (+0200)
Subject: lxc-stop to return 255 in case of error
X-Git-Tag: lxc_0_6_3~82
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=23075e69dc219c2a955a2c30c8600aacd0b68651;p=thirdparty%2Flxc.git

lxc-stop 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_stop.c b/src/lxc/lxc_stop.c
index fc6e28832..01d6d8f9a 100644
--- a/src/lxc/lxc_stop.c
+++ b/src/lxc/lxc_stop.c
@@ -48,19 +48,12 @@ Options :\n\
 
 int main(int argc, char *argv[])
 {
-	int ret;
-
-	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;
-
-	ret = lxc_stop(my_args.name);
-	if (ret)
-		return 1;
+		return -1;
 
-	return 0;
+	return lxc_stop(my_args.name);
 }
diff --git a/src/lxc/stop.c b/src/lxc/stop.c
index 5ecdacffd..72e2f87ef 100644
--- a/src/lxc/stop.c
+++ b/src/lxc/stop.c
@@ -42,7 +42,7 @@ int lxc_stop(const char *name)
 {
 	char init[MAXPATHLEN];
 	char val[MAXPIDLEN];
-	int fd, ret = -LXC_ERROR_INTERNAL;
+	int fd, ret = -1;
 	size_t pid;
 
 	if (lxc_check_lock(name) < 0)