lxc-monitor and lxc-wait to return 255 in case of error

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();

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)

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;