summaryrefslogtreecommitdiffstats
path: root/sbin/atacontrol
diff options
context:
space:
mode:
authorjohan <johan@FreeBSD.org>2003-11-05 19:20:41 +0000
committerjohan <johan@FreeBSD.org>2003-11-05 19:20:41 +0000
commit0bae88cecdfe43e971cec1e4e0d11c2ea43375e4 (patch)
treec964a2e74bc65ba0e23507753eba88696a0e812d /sbin/atacontrol
parentd28f0c552b085c5c2a85666ababecf36a7405105 (diff)
downloadFreeBSD-src-0bae88cecdfe43e971cec1e4e0d11c2ea43375e4.zip
FreeBSD-src-0bae88cecdfe43e971cec1e4e0d11c2ea43375e4.tar.gz
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)
Diffstat (limited to 'sbin/atacontrol')
-rw-r--r--sbin/atacontrol/Makefile1
-rw-r--r--sbin/atacontrol/atacontrol.c17
2 files changed, 14 insertions, 4 deletions
diff --git a/sbin/atacontrol/Makefile b/sbin/atacontrol/Makefile
index 9881273..73b9160 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 7c9645d..7e6d8b0 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;
}
OpenPOWER on IntegriCloud