[OpenWrt-Devel] [PATCH] fstools: use EXIT_FAILURE when indicating error on exit

[Michael Heimpold]

According to man page, using the EXIT_* macros is more portable than using
plain integer values.

Signed-off-by: Michael Heimpold <mhei at heimpold.de>
---
 block.c  | 8 ++++----
 blockd.c | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/block.c b/block.c
index 2e3841a..8e08310 100644
--- a/block.c
+++ b/block.c
@@ -742,16 +742,16 @@ static void check_filesystem(struct probe_info *pr)
 	if (!pid) {
 		if(!strncmp(pr->type, "f2fs", 4)) {
 			execl(ckfs, ckfs, "-f", pr->dev, NULL);
-			exit(-1);
+			exit(EXIT_FAILURE);
 		} else if(!strncmp(pr->type, "btrfs", 5)) {
 			execl(ckfs, ckfs, "--repair", pr->dev, NULL);
-			exit(-1);
+			exit(EXIT_FAILURE);
 		} else if(!strncmp(pr->type, "ntfs", 4)) {
 			execl(ckfs, ckfs, "-b", pr->dev, NULL);
-			exit(-1);
+			exit(EXIT_FAILURE);
 		} else {
 			execl(ckfs, ckfs, "-p", pr->dev, NULL);
-			exit(-1);
+			exit(EXIT_FAILURE);
 		}
 	} else if (pid > 0) {
 		int status;
diff --git a/blockd.c b/blockd.c
index 3af5390..a5da32c 100644
--- a/blockd.c
+++ b/blockd.c
@@ -95,7 +95,7 @@ block(char *cmd, char *action, char *device)
 		argv[a++] = device;
 		execvp(argv[0], argv);
 		ULOG_ERR("failed to spawn %s %s %s\n", *argv, action, device);
-		exit(-1);
+		exit(EXIT_FAILURE);
 
 	default:
 		waitpid(pid, &status, 0);
@@ -422,7 +422,7 @@ static int autofs_mount(void)
 	if (kproto_version != 5) {
 		ULOG_ERR("only kernel protocol version 5 is tested. You have %d.\n",
 			kproto_version);
-		exit(1);
+		exit(EXIT_FAILURE);
 	}
 	if (ioctl(fd_autofs_write, AUTOFS_IOC_SETTIMEOUT, &autofs_timeout))
 		ULOG_ERR("failed to set autofs timeout\n");
-- 
2.17.1


_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel