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 fc6e28832756e13df3eedc0516f2c4fa8d3e9359..01d6d8f9af130063bd1431b83f7421d1c5c391d2 100644 (file)
--- 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 5ecdacffdb03f4ba6b750ca59d7b0ff6d4f0ae0e..72e2f87ef6c04cdca15252a7aca70e957ad33880 100644 (file)
--- 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)