Constify and lockdown with WARNS=2.

Submitted by:	Mike Barcroft <mike@q9media.com>
MFC after:	2 weeks

3 files changed, 26 insertions, 25 deletions

diff --git a/bin/chio/Makefile b/bin/chio/Makefile
index 172032832c7a1..33bde4bac4dd8 100644
--- a/bin/chio/Makefile
+++ b/bin/chio/Makefile
@@ -2,6 +2,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 
 PROG=	chio
+WARNS?=	2
 SRCS=	chio.c
 
 .include <bsd.prog.mk>
diff --git a/bin/chio/chio.c b/bin/chio/chio.c
index 31b69d46fad6f..17df125e9b6c0 100644
--- a/bin/chio/chio.c
+++ b/bin/chio/chio.c
@@ -68,16 +68,16 @@ static	const char *bits_to_string __P((int, const char *));
 static	void find_element __P((char *, u_int16_t *, u_int16_t *));
 static	struct changer_element_status *get_element_status __P((u_int16_t, u_int16_t));
 
-static	int do_move __P((char *, int, char **));
-static	int do_exchange __P((char *, int, char **));
-static	int do_position __P((char *, int, char **));
-static	int do_params __P((char *, int, char **));
-static	int do_getpicker __P((char *, int, char **));
-static	int do_setpicker __P((char *, int, char **));
-static	int do_status __P((char *, int, char **));
-static	int do_ielem __P((char *, int, char **));
-static	int do_return __P((char *, int, char **));
-static	int do_voltag __P((char *, int, char **));
+static	int do_move __P((const char *, int, char **));
+static	int do_exchange __P((const char *, int, char **));
+static	int do_position __P((const char *, int, char **));
+static	int do_params __P((const char *, int, char **));
+static	int do_getpicker __P((const char *, int, char **));
+static	int do_setpicker __P((const char *, int, char **));
+static	int do_status __P((const char *, int, char **));
+static	int do_ielem __P((const char *, int, char **));
+static	int do_return __P((const char *, int, char **));
+static	int do_voltag __P((const char *, int, char **));
 
 #ifndef CHET_VT
 #define	CHET_VT		10			/* Completely Arbitrary */
@@ -176,7 +176,7 @@ main(argc, argv)
 
 static int
 do_move(cname, argc, argv)
-	char *cname;
+	const char *cname;
 	int argc;
 	char **argv;
 {
@@ -257,7 +257,7 @@ do_move(cname, argc, argv)
 
 static int
 do_exchange(cname, argc, argv)
-	char *cname;
+	const char *cname;
 	int argc;
 	char **argv;
 {
@@ -369,7 +369,7 @@ do_exchange(cname, argc, argv)
 
 static int
 do_position(cname, argc, argv)
-	char *cname;
+	const char *cname;
 	int argc;
 	char **argv;
 {
@@ -433,7 +433,7 @@ do_position(cname, argc, argv)
 /* ARGSUSED */
 static int
 do_params(cname, argc, argv)
-	char *cname;
+	const char *cname;
 	int argc;
 	char **argv;
 {
@@ -479,7 +479,7 @@ do_params(cname, argc, argv)
 /* ARGSUSED */
 static int
 do_getpicker(cname, argc, argv)
-	char *cname;
+	const char *cname;
 	int argc;
 	char **argv;
 {
@@ -509,7 +509,7 @@ do_getpicker(cname, argc, argv)
 
 static int
 do_setpicker(cname, argc, argv)
-	char *cname;
+	const char *cname;
 	int argc;
 	char **argv;
 {
@@ -540,14 +540,14 @@ do_setpicker(cname, argc, argv)
 
 static int
 do_status(cname, argc, argv)
-	char *cname;
+	const char *cname;
 	int argc;
 	char **argv;
 {
 	struct changer_params cp;
 	struct changer_element_status_request cesr;
 	int i, count, base, chet, schet, echet;
-	char *description;
+	const char *description;
 	int pvoltag = 0;
 	int avoltag = 0;
 	int sense = 0;
@@ -762,7 +762,7 @@ do_status(cname, argc, argv)
 
 static int
 do_ielem(cname, argc, argv)
-	char *cname;
+	const char *cname;
 	int argc;
 	char **argv;
 {
@@ -788,7 +788,7 @@ do_ielem(cname, argc, argv)
 
 static int
 do_voltag(cname, argc, argv)
-	char *cname;
+	const char *cname;
 	int argc;
 	char **argv;
 {
@@ -977,7 +977,7 @@ bits_to_string(v, cp)
  */
 static int
 do_return(cname, argc, argv)
-	char *cname;
+	const char *cname;
 	int  argc;
 	char **argv;
 {
diff --git a/bin/chio/defs.h b/bin/chio/defs.h
index f4580a54b5863..863e3dba7745b 100644
--- a/bin/chio/defs.h
+++ b/bin/chio/defs.h
@@ -33,18 +33,18 @@
  */
 
 struct element_type {
-	char	*et_name;	/* name; i.e. "picker, "slot", etc. */
+	const	char *et_name;	/* name; i.e. "picker, "slot", etc. */
 	int	et_type;	/* type number */
 };
 
 struct changer_command {
-	char	*cc_name;	/* command name */
+	const	char *cc_name;	/* command name */
 				/* command handler */
-	int	(*cc_handler) __P((char *, int, char **));
+	int	(*cc_handler) __P((const char *, int, char **));
 };
 
 struct special_word {
-	char	*sw_name;	/* special word */
+	const	char *sw_name;	/* special word */
 	int	sw_value;	/* token value */
 };