From 6f52836b844893d935e2be340a27a280f256b79e Mon Sep 17 00:00:00 2001
From: Xin LI <delphij@FreeBSD.org>
Date: Sat, 6 Nov 2004 18:15:44 +0000
Subject: [PATCH] ANSI'fy nfsd(8) and some minor changes to make it WARNS=6
 clean.

This commit does not affect the code generated, as proven by md5'ing
resulting binaries.

Bump WARNS accordingly.

Compiled on:	sparc64, ia64, i386
Reviewed by:	alfred (but blame me if anything goes wrong :-)
---
 usr.sbin/nfsd/Makefile |  2 +-
 usr.sbin/nfsd/nfsd.c   | 14 +++++---------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/usr.sbin/nfsd/Makefile b/usr.sbin/nfsd/Makefile
index 5a7fe974cf8..21ca3f377a6 100644
--- a/usr.sbin/nfsd/Makefile
+++ b/usr.sbin/nfsd/Makefile
@@ -4,6 +4,6 @@
 PROG=	nfsd
 MAN=	nfsd.8
 
-WARNS?=	0
+WARNS?=	6
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/nfsd/nfsd.c b/usr.sbin/nfsd/nfsd.c
index 273e3ecee19..13d1084cdb9 100644
--- a/usr.sbin/nfsd/nfsd.c
+++ b/usr.sbin/nfsd/nfsd.c
@@ -114,9 +114,7 @@ void	usage(void);
  * followed by "n" which is the number of nfsds' to fork off
  */
 int
-main(argc, argv, envp)
-	int argc;
-	char *argv[], *envp[];
+main(int argc, char **argv)
 {
 	struct nfsd_args nfsdargs;
 	struct addrinfo *ai_udp, *ai_tcp, *ai_udp6, *ai_tcp6, hints;
@@ -764,15 +762,13 @@ usage()
 }
 
 void
-nonfs(signo)
-	int signo;
+nonfs(__unused int signo)
 {
 	syslog(LOG_ERR, "missing system call: NFS not available");
 }
 
 void
-reapchild(signo)
-	int signo;
+reapchild(__unused int signo)
 {
 	pid_t pid;
 	int i;
@@ -807,7 +803,7 @@ killchildren()
  * Cleanup master after SIGUSR1.
  */
 void
-cleanup(signo)
+cleanup(__unused int signo)
 {
 	nfsd_exit(0);
 }
@@ -816,7 +812,7 @@ cleanup(signo)
  * Cleanup child after SIGUSR1.
  */
 void
-child_cleanup(signo)
+child_cleanup(__unused int signo)
 {
 	exit(0);
 }