CVS commit: src/usr.sbin/autofs

[Christos Zoulas]

Module Name:    src
Committed By:   christos
Date:           Thu Jan 11 13:44:26 UTC 2018

Modified Files:
        src/usr.sbin/autofs: automountd.c

Log Message:
sprinkle __dead, use EXIT_{SUCCESS,FAILURE}


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/autofs/automountd.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/usr.sbin/autofs/automountd.c
diff -u src/usr.sbin/autofs/automountd.c:1.1 src/usr.sbin/autofs/automountd.c:1.2
--- src/usr.sbin/autofs/automountd.c:1.1	Mon Jan  8 22:31:15 2018
+++ src/usr.sbin/autofs/automountd.c	Thu Jan 11 08:44:26 2018
@@ -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_daemo
 			/*
 			 * Exit without calling exit_callback().
 			 */
-			quick_exit(0);
+			quick_exit(EXIT_SUCCESS);
 		}
 
 		/*
@@ -288,7 +288,7 @@ handle_request(const struct autofs_daemo
 		/*
 		 * 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_daemo
 	/*
 	 * 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;
 }