summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchristos <christos@NetBSD.org>2018-01-11 13:44:26 +0000
committerchristos <christos@NetBSD.org>2018-01-11 13:44:26 +0000
commitf4e92075dec758e180e147e41a8d820bc9aff956 (patch)
treea0d5345044a73019f6a449bdc4323f0158c3e9fc
parentd4b745eee4463fb4ac19f81267b87928e09e49d4 (diff)
sprinkle __dead, use EXIT_{SUCCESS,FAILURE}
-rw-r--r--usr.sbin/autofs/automountd.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/usr.sbin/autofs/automountd.c b/usr.sbin/autofs/automountd.c
index b84ca2e04db..33acc3e732b 100644
--- a/usr.sbin/autofs/automountd.c
+++ b/usr.sbin/autofs/automountd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: automountd.c,v 1.1 2018/01/09 03:31:15 christos Exp $ */
+/* $NetBSD: automountd.c,v 1.2 2018/01/11 13:44:26 christos Exp $ */
/*-
* Copyright (c) 2017 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: automountd.c,v 1.1 2018/01/09 03:31:15 christos Exp $");
+__RCSID("$NetBSD: automountd.c,v 1.2 2018/01/11 13:44:26 christos Exp $");
#include <sys/types.h>
#include <sys/ioctl.h>
@@ -163,7 +163,7 @@ exit_callback(void)
done(EIO, true);
}
-static void
+__dead static void
handle_request(const struct autofs_daemon_request *adr, char *cmdline_options,
bool incomplete_hierarchy)
{
@@ -262,7 +262,7 @@ handle_request(const struct autofs_daemon_request *adr, char *cmdline_options,
/*
* Exit without calling exit_callback().
*/
- quick_exit(0);
+ quick_exit(EXIT_SUCCESS);
}
/*
@@ -288,7 +288,7 @@ handle_request(const struct autofs_daemon_request *adr, char *cmdline_options,
/*
* Exit without calling exit_callback().
*/
- quick_exit(0);
+ quick_exit(EXIT_SUCCESS);
}
log_debugx("found node defined at %s:%d; it is a mountpoint",
@@ -362,7 +362,7 @@ handle_request(const struct autofs_daemon_request *adr, char *cmdline_options,
/*
* Exit without calling exit_callback().
*/
- quick_exit(0);
+ quick_exit(EXIT_SUCCESS);
}
static void
@@ -424,13 +424,13 @@ wait_for_children(bool block)
return num;
}
-static void
+__dead static void
usage_automountd(void)
{
- fprintf(stderr, "usage: automountd [-D name=value][-m maxproc]"
- "[-o opts][-Tidv]\n");
- exit(1);
+ fprintf(stderr, "Usage: %s [-D name=value][-m maxproc]"
+ "[-o opts][-Tidv]\n", getprogname());
+ exit(EXIT_FAILURE);
}
static int
@@ -531,7 +531,7 @@ main_automountd(int argc, char **argv)
if (daemon(0, 0) == -1) {
log_warn("cannot daemonize");
pidfile_clean();
- exit(1);
+ exit(EXIT_FAILURE);
}
} else {
lesser_daemon();
@@ -597,5 +597,5 @@ main_automountd(int argc, char **argv)
pidfile_clean();
- return 0;
+ return EXIT_SUCCESS;
}