Mailing List Archive

From: Leigh Brown <leigh@solinno.co.uk>

Use EXIT_SUCCESS/EXIT_FAILURE constants instead of magic numbers.

Signed-off-by: Leigh Brown <leigh@solinno.co.uk>
---
tools/misc/xenwatchdogd.c | 40 +++++++++++++++++++--------------------
1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/tools/misc/xenwatchdogd.c b/tools/misc/xenwatchdogd.c
index 254117b554..2f7c822d61 100644
--- a/tools/misc/xenwatchdogd.c
+++ b/tools/misc/xenwatchdogd.c
@@ -17,37 +17,37 @@ void daemonize(void)
{
switch (fork()) {
case -1:
- err(1, "fork");
+ err(EXIT_FAILURE, "fork");
case 0:
break;
default:
- exit(0);
+ exit(EXIT_SUCCESS);
}
umask(0);
if (setsid() < 0)
- err(1, "setsid");
+ err(EXIT_FAILURE, "setsid");
if (chdir("/") < 0)
- err(1, "chdir /");
+ err(EXIT_FAILURE, "chdir /");
if (freopen("/dev/null", "r", stdin) == NULL)
- err(1, "reopen stdin");
+ err(EXIT_FAILURE, "reopen stdin");
if(freopen("/dev/null", "w", stdout) == NULL)
- err(1, "reopen stdout");
+ err(EXIT_FAILURE, "reopen stdout");
if(freopen("/dev/null", "w", stderr) == NULL)
- err(1, "reopen stderr");
+ err(EXIT_FAILURE, "reopen stderr");
}

void catch_exit(int sig)
{
if (id)
xc_watchdog(h, id, 300);
- exit(0);
+ exit(EXIT_SUCCESS);
}

void catch_usr1(int sig)
{
if (id)
xc_watchdog(h, id, 0);
- exit(0);
+ exit(EXIT_SUCCESS);
}

int main(int argc, char **argv)
@@ -56,44 +56,44 @@ int main(int argc, char **argv)
int ret;

if (argc < 2)
- errx(1, "usage: %s <timeout> <sleep>", argv[0]);
+ errx(EXIT_FAILURE, "usage: %s <timeout> <sleep>", argv[0]);

daemonize();

h = xc_interface_open(NULL, NULL, 0);
if (h == NULL)
- err(1, "xc_interface_open");
+ err(EXIT_FAILURE, "xc_interface_open");

t = strtoul(argv[1], NULL, 0);
if (t == ULONG_MAX)
- err(1, "strtoul");
+ err(EXIT_FAILURE, "strtoul");

s = t / 2;
if (argc == 3) {
s = strtoul(argv[2], NULL, 0);
if (s == ULONG_MAX)
- err(1, "strtoul");
+ err(EXIT_FAILURE, "strtoul");
}

if (signal(SIGHUP, &catch_exit) == SIG_ERR)
- err(1, "signal");
+ err(EXIT_FAILURE, "signal");
if (signal(SIGINT, &catch_exit) == SIG_ERR)
- err(1, "signal");
+ err(EXIT_FAILURE, "signal");
if (signal(SIGQUIT, &catch_exit) == SIG_ERR)
- err(1, "signal");
+ err(EXIT_FAILURE, "signal");
if (signal(SIGTERM, &catch_exit) == SIG_ERR)
- err(1, "signal");
+ err(EXIT_FAILURE, "signal");
if (signal(SIGUSR1, &catch_usr1) == SIG_ERR)
- err(1, "signal");
+ err(EXIT_FAILURE, "signal");

id = xc_watchdog(h, 0, t);
if (id <= 0)
- err(1, "xc_watchdog setup");
+ err(EXIT_FAILURE, "xc_watchdog setup");

for (;;) {
sleep(s);
ret = xc_watchdog(h, id, t);
if (ret != 0)
- err(1, "xc_watchdog");
+ err(EXIT_FAILURE, "xc_watchdog");
}
}
--
2.39.2