From 115d0d95a1c116c7a9e9c09e2ba031303a7ed3a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ulrich=20Sp=C3=B6rlein?= <uqs@FreeBSD.org>
Date: Sat, 27 Feb 2010 10:16:14 +0000
Subject: [PATCH] mount_ntfs(8): make WARNS=6 clean

PR:		bin/140000
Approved by:	ed (co-mentor)
---
 sbin/mount_ntfs/Makefile     |  3 +--
 sbin/mount_ntfs/mount_ntfs.c | 15 +++++----------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/sbin/mount_ntfs/Makefile b/sbin/mount_ntfs/Makefile
index 5938b0dd52a6..416f1ac8ab24 100644
--- a/sbin/mount_ntfs/Makefile
+++ b/sbin/mount_ntfs/Makefile
@@ -9,8 +9,7 @@ DPADD=	${LIBKICONV}
 LDADD=	-lkiconv
 
 MOUNT=	${.CURDIR}/../mount
-CFLAGS+=-I${MOUNT}
-WARNS?=	0
+CFLAGS+= -I${MOUNT}
 
 # Needs to be dynamically linked for optional dlopen() access to
 # userland libiconv
diff --git a/sbin/mount_ntfs/mount_ntfs.c b/sbin/mount_ntfs/mount_ntfs.c
index 4bd118f2b527..80fcab02e16b 100644
--- a/sbin/mount_ntfs/mount_ntfs.c
+++ b/sbin/mount_ntfs/mount_ntfs.c
@@ -69,9 +69,7 @@ static void	usage(void) __dead2;
 static int	set_charset(struct ntfs_args *);
 
 int
-main(argc, argv)
-	int argc;
-	char **argv;
+main(int argc, char *argv[])
 {
 	struct ntfs_args args;
 	struct stat sb;
@@ -193,8 +191,7 @@ main(argc, argv)
 }
 
 gid_t
-a_gid(s)
-	char *s;
+a_gid(char *s)
 {
 	struct group *gr;
 	char *gname;
@@ -213,8 +210,7 @@ a_gid(s)
 }
 
 uid_t
-a_uid(s)
-	char *s;
+a_uid(char *s)
 {
 	struct passwd *pw;
 	char *uname;
@@ -233,8 +229,7 @@ a_uid(s)
 }
 
 mode_t
-a_mask(s)
-	char *s;
+a_mask(char *s)
 {
 	int done, rv=0;
 	char *ep;
@@ -250,7 +245,7 @@ a_mask(s)
 }
 
 void
-usage()
+usage(void)
 {
 #ifdef TRANSITION_PERIOD_HACK
 	fprintf(stderr, "%s\n%s\n",