Fix warnings related to -Wall -Wcast-qual

7 files changed, 16 insertions, 12 deletions

diff --git a/sys/kern/kern_environment.c b/sys/kern/kern_environment.c
index 565a16d..df235e4 100644
--- a/sys/kern/kern_environment.c
+++ b/sys/kern/kern_environment.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: kern_environment.c,v 1.4 1999/01/15 17:24:56 msmith Exp $
+ *	$Id: kern_environment.c,v 1.5 1999/01/27 21:24:50 dillon Exp $
  */
 
 /*
@@ -71,7 +71,7 @@ getenv(char *name)
 int
 getenv_int(char *name, int *data)
 {
-    char	*value, *vtp;
+    const char	*value, *vtp;
     quad_t	iv;
     
     if ((value = getenv(name)) == NULL)
diff --git a/sys/kern/kern_threads.c b/sys/kern/kern_threads.c
index 3d8947f..6c7bcf2 100644
--- a/sys/kern/kern_threads.c
+++ b/sys/kern/kern_threads.c
@@ -46,7 +46,7 @@
  * in Germany will I accept domestic beer.  This code may or may not work
  * and I certainly make no claims as to its fitness for *any* purpose.
  * 
- * $Id: kern_threads.c,v 1.11 1999/01/27 10:14:05 bde Exp $
+ * $Id: kern_threads.c,v 1.12 1999/01/27 21:49:56 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -79,7 +79,7 @@ thr_sleep(struct proc *p, struct thr_sleep_args *uap) {
 		/*
 		 * Get timespec struct
 		 */
-		if ((error = copyin((caddr_t) uap->timeout, (caddr_t) &ts, sizeof ts)) != 0) {
+		if ((error = copyin((c_caddr_t) uap->timeout, (caddr_t) &ts, sizeof ts)) != 0) {
 			p->p_wakeup = 0;
 			return error;
 		}
diff --git a/sys/kern/tty.c b/sys/kern/tty.c
index 1adf784..faa675e 100644
--- a/sys/kern/tty.c
+++ b/sys/kern/tty.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tty.c	8.8 (Berkeley) 1/21/94
- * $Id: tty.c,v 1.110 1998/12/08 10:22:07 bde Exp $
+ * $Id: tty.c,v 1.111 1999/01/08 17:31:12 eivind Exp $
  */
 
 /*-
@@ -809,7 +809,7 @@ ttioctl(tp, cmd, data, flag)
 			    ISSET(constty->t_state, TS_CONNECTED))
 				return (EBUSY);
 #ifndef	UCONSOLE
-			if (error = suser(p->p_ucred, &p->p_acflag))
+			if ((error = suser(p->p_ucred, &p->p_acflag)) != 0)
 				return (error);
 #endif
 			constty = tp;
diff --git a/sys/kern/vfs_aio.c b/sys/kern/vfs_aio.c
index 9eb6ee9..5fa6a237 100644
--- a/sys/kern/vfs_aio.c
+++ b/sys/kern/vfs_aio.c
@@ -13,7 +13,7 @@
  * bad that happens because of using this software isn't the responsibility
  * of the author.  This software is distributed AS-IS.
  *
- * $Id: vfs_aio.c,v 1.38 1999/01/27 21:49:57 dillon Exp $
+ * $Id: vfs_aio.c,v 1.39 1999/01/28 00:57:47 dillon Exp $
  */
 
 /*
@@ -1472,7 +1472,7 @@ aio_suspend(struct proc *p, struct aio_suspend_args *uap)
 		/*
 		 * Get timespec struct
 		 */
-		if ((error = copyin((caddr_t) uap->timeout, (caddr_t) &ts, sizeof ts)) != 0) {
+		if ((error = copyin((c_caddr_t) uap->timeout, (caddr_t) &ts, sizeof ts)) != 0) {
 			return error;
 		}
 
diff --git a/sys/kern/vfs_extattr.c b/sys/kern/vfs_extattr.c
index 548b480..b14c802 100644
--- a/sys/kern/vfs_extattr.c
+++ b/sys/kern/vfs_extattr.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_syscalls.c	8.13 (Berkeley) 4/15/94
- * $Id: vfs_syscalls.c,v 1.113 1999/01/24 06:28:37 bde Exp $
+ * $Id: vfs_syscalls.c,v 1.114 1999/01/27 21:49:58 dillon Exp $
  */
 
 /* For 4.3 integer FS ID compatibility */
@@ -111,7 +111,9 @@ mount(p, uap)
 	struct vfsconf *vfsp;
 	int error, flag = 0, flag2 = 0;
 	struct vattr va;
+#ifdef COMPAT_43
 	u_long fstypenum;
+#endif
 	struct nameidata nd;
 	char fstypename[MFSNAMELEN];
 
diff --git a/sys/kern/vfs_init.c b/sys/kern/vfs_init.c
index 3b8715b..8b5f321 100644
--- a/sys/kern/vfs_init.c
+++ b/sys/kern/vfs_init.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_init.c	8.3 (Berkeley) 1/4/94
- * $Id: vfs_init.c,v 1.41 1998/12/07 21:58:30 archie Exp $
+ * $Id: vfs_init.c,v 1.42 1999/01/28 00:57:47 dillon Exp $
  */
 
 
@@ -231,7 +231,7 @@ vfs_rm_vnodeops(const void *data)
 	struct vnodeop_desc *desc;
 	int i, j, k;
 
-	opv = (struct vnodeopv_desc *)data;
+	opv = (const struct vnodeopv_desc *)data;
 	/* Lower ref counts on descs in the table and release if zero */
 	opv_desc_vector = *(opv->opv_desc_vector_p);
 	for (i = 0; (desc = opv->opv_desc_ops[i].opve_op); i++) {
diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c
index 548b480..b14c802 100644
--- a/sys/kern/vfs_syscalls.c
+++ b/sys/kern/vfs_syscalls.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_syscalls.c	8.13 (Berkeley) 4/15/94
- * $Id: vfs_syscalls.c,v 1.113 1999/01/24 06:28:37 bde Exp $
+ * $Id: vfs_syscalls.c,v 1.114 1999/01/27 21:49:58 dillon Exp $
  */
 
 /* For 4.3 integer FS ID compatibility */
@@ -111,7 +111,9 @@ mount(p, uap)
 	struct vfsconf *vfsp;
 	int error, flag = 0, flag2 = 0;
 	struct vattr va;
+#ifdef COMPAT_43
 	u_long fstypenum;
+#endif
 	struct nameidata nd;
 	char fstypename[MFSNAMELEN];