procd: replace exit(-1) with exit(EXIT_FAILURE)

Signed-off-by: Michael Heimpold <mhei@heimpold.de>

diff --git a/initd/init.c b/initd/init.c
index b253fb66f36174d7740d8e31c6d0a7cd73a10f99..9b4782608e1a7a9f411eaacfa9b97b2d6b3fe89c 100644 (file)
--- a/initd/init.c
+++ b/initd/init.c
@@ -92,7 +92,7 @@ main(int argc, char **argv)
 
                execvp(kmod[0], kmod);
                ERROR("Failed to start kmodloader: %m\n");
-               exit(-1);
+               exit(EXIT_FAILURE);
        }
        if (pid <= 0) {
                ERROR("Failed to start kmodloader instance: %m\n");

diff --git a/initd/preinit.c b/initd/preinit.c
index 84e62b0d4af1179b20f57d6a85b5c92710e9e793..9dfe5c17576fbd2fcb19ee887e054e3ee24c6464 100644 (file)
--- a/initd/preinit.c
+++ b/initd/preinit.c
@@ -23,7 +23,7 @@
 #include <libubus.h>
 
 #include <stdio.h>
-
+#include <stdlib.h>
 #include <unistd.h>
 
 #include "init.h"
@@ -135,7 +135,7 @@ preinit(void)
        if (!plugd_proc.pid) {
                execvp(plug[0], plug);
                ERROR("Failed to start plugd: %m\n");
-               exit(-1);
+               exit(EXIT_FAILURE);
        }
        if (plugd_proc.pid <= 0) {
                ERROR("Failed to start new plugd instance: %m\n");
@@ -157,7 +157,7 @@ preinit(void)
        if (!preinit_proc.pid) {
                execvp(init[0], init);
                ERROR("Failed to start preinit: %m\n");
-               exit(-1);
+               exit(EXIT_FAILURE);
        }
        if (preinit_proc.pid <= 0) {
                ERROR("Failed to start new preinit instance: %m\n");

diff --git a/initd/zram.c b/initd/zram.c
index 487d3d615f1d0b0eb9a28697383c2c89806868c0..380fe0ea75cfd134232c64706449d5448170bcf8 100644 (file)
--- a/initd/zram.c
+++ b/initd/zram.c
@@ -66,7 +66,7 @@ early_insmod(char *module)
                modprobe[1] = path;
                execvp(modprobe[0], modprobe);
                ERROR("Can't exec %s: %m\n", modprobe[0]);
-               exit(-1);
+               exit(EXIT_FAILURE);
        }
 
        if (pid <= 0) {
@@ -109,7 +109,7 @@ mount_zram_on_tmp(void)
        if (!pid) {
                execvp(mkfs[0], mkfs);
                ERROR("Can't exec %s: %m\n", mkfs[0]);
-               exit(-1);
+               exit(EXIT_FAILURE);
        } else if (pid <= 0) {
                ERROR("Can't exec %s: %m\n", mkfs[0]);
                return -1;

diff --git a/plug/coldplug.c b/plug/coldplug.c
index 12df421bb205c4074a4f08af4493bec3d9d37891..b185083b0b60833b504c5c8a02bc5b63f78ce00c 100644 (file)
--- a/plug/coldplug.c
+++ b/plug/coldplug.c
@@ -16,6 +16,7 @@
 #include <sys/types.h>
 #include <sys/mount.h>
 
+#include <stdlib.h>
 #include <unistd.h>
 
 #include "../procd.h"
@@ -59,7 +60,7 @@ void procd_coldplug(void)
        if (!udevtrigger.pid) {
                execvp(argv[0], argv);
                ERROR("Failed to start coldplug: %m\n");
-               exit(-1);
+               exit(EXIT_FAILURE);
        }
 
        if (udevtrigger.pid <= 0) {

diff --git a/plug/hotplug.c b/plug/hotplug.c
index c572ced187a77df2a80493cf7df3634c2af0c318..de0511fbd4891ff5e226f0059e29d3cf016915fe 100644 (file)
--- a/plug/hotplug.c
+++ b/plug/hotplug.c
@@ -221,7 +221,7 @@ static void handle_exec(struct blob_attr *msg, struct blob_attr *data)
                argv[i] = NULL;
                execvp(argv[0], &argv[0]);
        }
-       exit(-1);
+       exit(EXIT_FAILURE);
 }
 
 static void handle_button_start(struct blob_attr *msg, struct blob_attr *data)
@@ -246,7 +246,7 @@ static void handle_firmware(struct blob_attr *msg, struct blob_attr *data)
 
        if (!file || !dir || !dev) {
                ERROR("Request for unknown firmware %s/%s\n", dir, file);
-               exit(-1);
+               exit(EXIT_FAILURE);
        }
 
        path = alloca(strlen(dir) + strlen(file) + 2);
@@ -271,11 +271,11 @@ send_to_kernel:
        load = open(loadpath, O_WRONLY);
        if (!load) {
                ERROR("Failed to open %s: %m\n", loadpath);
-               exit(-1);
+               exit(EXIT_FAILURE);
        }
        if (write(load, "1", 1) == -1) {
                ERROR("Failed to write to %s: %m\n", loadpath);
-               exit(-1);
+               exit(EXIT_FAILURE);
        }
        close(load);
 
@@ -283,7 +283,7 @@ send_to_kernel:
        fw = open(syspath, O_WRONLY);
        if (fw < 0) {
                ERROR("Failed to open %s: %m\n", syspath);
-               exit(-1);
+               exit(EXIT_FAILURE);
        }
 
        len = s.st_size;
@@ -309,7 +309,7 @@ send_to_kernel:
 
        DEBUG(2, "Done loading %s\n", path);
 
-       exit(-1);
+       exit(EXIT_FAILURE);
 }
 
 static void handle_start_console(struct blob_attr *msg, struct blob_attr *data)
@@ -323,7 +323,7 @@ static void handle_start_console(struct blob_attr *msg, struct blob_attr *data)
 
        DEBUG(2, "Done starting console for %s\n", dev);
 
-       exit(-1);
+       exit(EXIT_FAILURE);
 }
 
 enum {

diff --git a/upgraded/upgraded.c b/upgraded/upgraded.c
index 0b82f20241337921a8b8bccc81ff0917f4ac1577..db98701d8ab64da4c78f105a6182ae0db9edb062 100644 (file)
--- a/upgraded/upgraded.c
+++ b/upgraded/upgraded.c
@@ -56,7 +56,7 @@ static void sysupgrade(char *path, char *command)
                /* Child */
                execvp(args[0], args);
                fprintf(stderr, "Failed to exec sysupgrade\n");
-               _exit(-1);
+               _exit(EXIT_FAILURE);
        }
 
        uloop_process_add(&upgrade_proc);