lxc-freeze and lxc-unfreeze 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/freezer.c b/src/lxc/freezer.c
index 05d77ef1465276c650fcc0f66fdddfebe989d2dc..c99a315fa85cad4150f498eff8568da7312a33a8 100644 (file)
--- a/src/lxc/freezer.c
+++ b/src/lxc/freezer.c
@@ -75,22 +75,16 @@ static int freeze_unfreeze(const char *name, int freeze)
 int lxc_freeze(const char *name)
 {
        if (freeze_unfreeze(name, 1))
-               return -LXC_ERROR_INTERNAL;
-
-       if (lxc_setstate(name, FROZEN))
-               return -LXC_ERROR_INTERNAL;
+               return -1;
 
-       return 0;
+       return lxc_setstate(name, FROZEN);
 }
 
 int lxc_unfreeze(const char *name)
 {
        if (freeze_unfreeze(name, 0))
-               return -LXC_ERROR_INTERNAL;
-
-       if (lxc_setstate(name, RUNNING))
-               return -LXC_ERROR_INTERNAL;
+               return -1;
 
-       return 0;
+       return lxc_setstate(name, RUNNING);
 }
 

diff --git a/src/lxc/lxc_freeze.c b/src/lxc/lxc_freeze.c
index ede5e911fc49b37d651601cf124f84b6a19f8edc..a5be16c8d7e1d49c54f842048bf89789bd1d74a6 100644 (file)
--- a/src/lxc/lxc_freeze.c
+++ b/src/lxc/lxc_freeze.c
@@ -49,19 +49,13 @@ 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;
-
-       if (lxc_freeze(my_args.name))
-               return 1;
+               return -1;
 
-       return 0;
+       return lxc_freeze(my_args.name);
 }
 

diff --git a/src/lxc/lxc_unfreeze.c b/src/lxc/lxc_unfreeze.c
index 3c778d0674f8e925b9f281a44886bbadea0efb0c..02ca70ddaeafe8a3b9301f9fee104f4d67b09c73 100644 (file)
--- a/src/lxc/lxc_unfreeze.c
+++ b/src/lxc/lxc_unfreeze.c
@@ -48,19 +48,13 @@ 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;
-
-       if (lxc_unfreeze(my_args.name))
-               return 1;
+               return -1;
 
-       return 0;
+       return lxc_unfreeze(my_args.name);
 }