From 8fb7e7856501e16c74e51742eebcf389a51cdba5 Mon Sep 17 00:00:00 2001
From: Johan Karlsson <johan@FreeBSD.org>
Date: Wed, 5 Nov 2003 19:20:41 +0000
Subject: [PATCH] Make this WARNS=6 clean by:  - declaring 'mode2str' as
 returning a 'const char *'  - prototyping all function  - rename the argument
 'version' to 'ver', not to shadow         the now prototyped function
 'version'.

Also mark it as WARNS?= 6 clean to try to keep it clean.

Tested by:	make universe (including amd64)
---
 sbin/atacontrol/Makefile     |  1 +
 sbin/atacontrol/atacontrol.c | 17 +++++++++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/sbin/atacontrol/Makefile b/sbin/atacontrol/Makefile
index 9881273c2117..73b916080d42 100644
--- a/sbin/atacontrol/Makefile
+++ b/sbin/atacontrol/Makefile
@@ -2,5 +2,6 @@
 
 PROG=	atacontrol
 MAN=	atacontrol.8
+WARNS?=	6
 
 .include <bsd.prog.mk>
diff --git a/sbin/atacontrol/atacontrol.c b/sbin/atacontrol/atacontrol.c
index 7c9645d96354..7e6d8b0f3987 100644
--- a/sbin/atacontrol/atacontrol.c
+++ b/sbin/atacontrol/atacontrol.c
@@ -40,7 +40,16 @@
 #include <string.h>
 #include <sysexits.h>
 
-char *
+const char *mode2str(int mode);
+int str2mode(char *str);
+void usage(void);
+int version(int ver);
+void param_print(struct ata_params *parm);
+void cap_print(struct ata_params *parm);
+int ata_cap_print(int fd, int channel, int device);
+int info_print(int fd, int channel, int prchan);
+
+const char *
 mode2str(int mode)
 {
 	switch (mode) {
@@ -91,14 +100,14 @@ usage()
 }
 
 int
-version(int version)
+version(int ver)
 {
 	int bit;
     
-	if (version == 0xffff)
+	if (ver == 0xffff)
 		return 0;
 	for (bit = 15; bit >= 0; bit--)
-		if (version & (1<<bit))
+		if (ver & (1<<bit))
 			return bit;
     	return 0;
 }