lxc-monitor and lxc-wait 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_monitor.c b/src/lxc/lxc_monitor.c
index ea33328a69de3eedcb5cd386755bc0419f1e1953..ff91a2f2bfa4a5e9e0b05d7b0943102d882e2ed2 100644 (file)
--- a/src/lxc/lxc_monitor.c
+++ b/src/lxc/lxc_monitor.c
@@ -56,22 +56,21 @@ int main(int argc, char *argv[])
        char *regexp;
        struct lxc_msg msg;
        regex_t preg;
-       int fd, ret;
+       int fd;
 
-       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;
 
        regexp = malloc(strlen(my_args.name) + 3);
        sprintf(regexp, "^%s$", my_args.name);
 
        if (regcomp(&preg, regexp, REG_NOSUB|REG_EXTENDED)) {
                ERROR("failed to compile the regex '%s'", my_args.name);
-               return 1;
+               return -1;
        }
 
        fd = lxc_monitor_open();

diff --git a/src/lxc/lxc_wait.c b/src/lxc/lxc_wait.c
index 6581dc263f3e60808502462f226b4fb90e68f0a6..6e01a056b77440fdd5011c7e6e9ff687d99b88ba 100644 (file)
--- a/src/lxc/lxc_wait.c
+++ b/src/lxc/lxc_wait.c
@@ -95,19 +95,16 @@ int main(int argc, char *argv[])
 {
        struct lxc_msg msg;
        int s[MAX_STATE] = { }, fd;
-       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 = fillwaitedstates(my_args.states, s);
-       if (ret)
-               return 1;
+       if (fillwaitedstates(my_args.states, s))
+               return -1;
 
        fd = lxc_monitor_open();
        if (fd < 0)

diff --git a/src/lxc/monitor.c b/src/lxc/monitor.c
index 8e6bff8ab9e2025b04a8d8453d3c8ce1f5b250a9..24e85e7adcb391f7ead61ea4ad0b4757c92906db 100644 (file)
--- a/src/lxc/monitor.c
+++ b/src/lxc/monitor.c
@@ -163,7 +163,7 @@ int lxc_monitor_read(int fd, struct lxc_msg *msg)
                       (struct sockaddr *)&from, &len);
        if (ret < 0) {
                SYSERROR("failed to receive state");
-               return -LXC_ERROR_INTERNAL;
+               return -1;
        }
 
        return ret;