From d612752bc70b7ef16f8e58a3b027cf5e00b2410b Mon Sep 17 00:00:00 2001 From: Chris Pressey Date: Sun, 9 Jan 2005 04:43:33 +0000 Subject: [PATCH] Raise WARNS to 6: - Add function prototypes. - Rename a parameter. Submitted-by: Larry Lansing --- sbin/atacontrol/Makefile | 4 ++-- sbin/atacontrol/atacontrol.c | 19 ++++++++++++++----- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/sbin/atacontrol/Makefile b/sbin/atacontrol/Makefile index 208491450b..e4244bf743 100644 --- a/sbin/atacontrol/Makefile +++ b/sbin/atacontrol/Makefile @@ -1,8 +1,8 @@ #$FreeBSD: src/sbin/atacontrol/Makefile,v 1.6.2.1 2002/03/18 08:40:00 sos Exp $ -#$DragonFly: src/sbin/atacontrol/Makefile,v 1.2 2003/06/17 04:27:32 dillon Exp $ +#$DragonFly: src/sbin/atacontrol/Makefile,v 1.3 2005/01/09 04:43:33 cpressey Exp $ PROG= atacontrol -WARNS= 0 +WARNS= 6 MAN= atacontrol.8 .include diff --git a/sbin/atacontrol/atacontrol.c b/sbin/atacontrol/atacontrol.c index 0341e03743..5432acfe2a 100644 --- a/sbin/atacontrol/atacontrol.c +++ b/sbin/atacontrol/atacontrol.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sbin/atacontrol/atacontrol.c,v 1.11.2.5 2002/08/21 13:18:17 sos Exp $ - * $DragonFly: src/sbin/atacontrol/atacontrol.c,v 1.3 2003/09/28 14:39:16 hmp Exp $ + * $DragonFly: src/sbin/atacontrol/atacontrol.c,v 1.4 2005/01/09 04:43:33 cpressey Exp $ */ #include @@ -37,7 +37,16 @@ #include #include -char * +static const char *mode2str(int); +static int str2mode(char *); +static void usage(void); +static int version(int); +static void param_print(struct ata_params *); +static void cap_print(struct ata_params *); +static int ata_cap_print(int, int, int); +static int info_print(int, int, int); + +const char * mode2str(int mode) { switch (mode) { @@ -88,14 +97,14 @@ usage(void) } 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<