Fix warnings in preparation for adding -Wall -Wcast-qual to the

    kernel compile

13 files changed, 56 insertions, 55 deletions

diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c
index 2f36848..bb69fb6 100644
--- a/sys/kern/kern_exec.c
+++ b/sys/kern/kern_exec.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: kern_exec.c,v 1.93 1999/01/06 23:05:38 julian Exp $
+ *	$Id: kern_exec.c,v 1.94 1999/01/27 21:49:55 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -255,8 +255,8 @@ interpret:
 	 * Don't honor setuid/setgid if the filesystem prohibits it or if
 	 * the process is being traced.
 	 */
-	if ((attr.va_mode & VSUID && p->p_ucred->cr_uid != attr.va_uid ||
-	     attr.va_mode & VSGID && p->p_ucred->cr_gid != attr.va_gid) &&
+	if ((((attr.va_mode & VSUID) && p->p_ucred->cr_uid != attr.va_uid) ||
+	     ((attr.va_mode & VSGID) && p->p_ucred->cr_gid != attr.va_gid)) &&
 	    (imgp->vp->v_mount->mnt_flag & MNT_NOSUID) == 0 &&
 	    (p->p_flag & P_TRACED) == 0) {
 		/*
diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c
index f44fb1f..1185662 100644
--- a/sys/kern/kern_proc.c
+++ b/sys/kern/kern_proc.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_proc.c	8.7 (Berkeley) 2/14/95
- * $Id: kern_proc.c,v 1.43 1999/01/13 03:11:42 julian Exp $
+ * $Id: kern_proc.c,v 1.44 1999/01/26 02:38:10 julian Exp $
  */
 
 #include <sys/param.h>
@@ -376,7 +376,7 @@ DB_SHOW_COMMAND(pgrpdump, pgrpdump)
 	register int i;
 
 	for (i = 0; i <= pgrphash; i++) {
-		if (pgrp = pgrphashtbl[i].lh_first) {
+		if ((pgrp = pgrphashtbl[i].lh_first) != NULL) {
 			printf("\tindx %d\n", i);
 			for (; pgrp != 0; pgrp = pgrp->pg_hash.le_next) {
 				printf(
diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c
index e5e1a3e..728e430 100644
--- a/sys/kern/kern_prot.c
+++ b/sys/kern/kern_prot.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_prot.c	8.6 (Berkeley) 1/21/94
- * $Id: kern_prot.c,v 1.42 1998/11/10 09:16:29 peter Exp $
+ * $Id: kern_prot.c,v 1.43 1998/12/13 07:07:51 truckman Exp $
  */
 
 /*
@@ -651,10 +651,10 @@ setreuid(p, uap)
 
 	ruid = uap->ruid;
 	euid = uap->euid;
-	if ((ruid != (uid_t)-1 && ruid != pc->p_ruid && ruid != pc->p_svuid ||
-	     euid != (uid_t)-1 && euid != pc->pc_ucred->cr_uid &&
-	     euid != pc->p_ruid && euid != pc->p_svuid) &&
-	    (error = suser(pc->pc_ucred, &p->p_acflag)))
+	if (((ruid != (uid_t)-1 && ruid != pc->p_ruid && ruid != pc->p_svuid) ||
+	     (euid != (uid_t)-1 && euid != pc->pc_ucred->cr_uid &&
+	     euid != pc->p_ruid && euid != pc->p_svuid)) &&
+	    (error = suser(pc->pc_ucred, &p->p_acflag)) != 0)
 		return (error);
 
 	if (euid != (uid_t)-1 && pc->pc_ucred->cr_uid != euid) {
@@ -694,10 +694,10 @@ setregid(p, uap)
 
 	rgid = uap->rgid;
 	egid = uap->egid;
-	if ((rgid != (gid_t)-1 && rgid != pc->p_rgid && rgid != pc->p_svgid ||
-	     egid != (gid_t)-1 && egid != pc->pc_ucred->cr_groups[0] &&
-	     egid != pc->p_rgid && egid != pc->p_svgid) &&
-	    (error = suser(pc->pc_ucred, &p->p_acflag)))
+	if (((rgid != (gid_t)-1 && rgid != pc->p_rgid && rgid != pc->p_svgid) ||
+	     (egid != (gid_t)-1 && egid != pc->pc_ucred->cr_groups[0] &&
+	     egid != pc->p_rgid && egid != pc->p_svgid)) &&
+	    (error = suser(pc->pc_ucred, &p->p_acflag)) != 0)
 		return (error);
 
 	if (egid != (gid_t)-1 && pc->pc_ucred->cr_groups[0] != egid) {
diff --git a/sys/kern/link_aout.c b/sys/kern/link_aout.c
index 27ba4bd..f99f8ad 100644
--- a/sys/kern/link_aout.c
+++ b/sys/kern/link_aout.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: link_aout.c,v 1.17 1998/11/04 15:20:57 peter Exp $
+ *	$Id: link_aout.c,v 1.18 1999/01/25 08:42:24 dfr Exp $
  */
 
 #ifndef __alpha__
@@ -47,11 +47,11 @@ static int		link_aout_load_module(const char*, linker_file_t*);
 static int		link_aout_load_file(const char*, linker_file_t*);
 
 static int		link_aout_lookup_symbol(linker_file_t, const char*,
-						linker_sym_t*);
-static int		link_aout_symbol_values(linker_file_t file, linker_sym_t sym,
+						c_linker_sym_t*);
+static int		link_aout_symbol_values(linker_file_t file, c_linker_sym_t sym,
 						linker_symval_t* symval);
 static int		link_aout_search_symbol(linker_file_t lf, caddr_t value,
-						linker_sym_t* sym, long* diffp);
+						c_linker_sym_t* sym, long* diffp);
 static void		link_aout_unload_file(linker_file_t);
 static void		link_aout_unload_module(linker_file_t);
 
@@ -448,7 +448,7 @@ symbol_hash_value(aout_file_t af, const char* name)
 
 int
 link_aout_lookup_symbol(linker_file_t file, const char* name,
-			linker_sym_t* sym)
+			c_linker_sym_t* sym)
 {
     aout_file_t af = file->priv;
     long hashval;
@@ -520,11 +520,11 @@ restart:
 
 
 static int
-link_aout_symbol_values(linker_file_t file, linker_sym_t sym,
+link_aout_symbol_values(linker_file_t file, c_linker_sym_t sym,
 			linker_symval_t* symval)
 {
     aout_file_t af = file->priv;
-    struct nzlist* np = (struct nzlist*) sym;
+    const struct nzlist* np = (const struct nzlist*) sym;
     char* stringbase;
     long numsym = LD_STABSZ(af->dynamic) / sizeof(struct nzlist);
     struct nzlist *symbase;
@@ -551,7 +551,7 @@ link_aout_symbol_values(linker_file_t file, linker_sym_t sym,
 
 static int
 link_aout_search_symbol(linker_file_t lf, caddr_t value,
-			linker_sym_t* sym, long* diffp)
+			c_linker_sym_t* sym, long* diffp)
 {
 	aout_file_t af = lf->priv;
 	u_long off = (uintptr_t) (void *) value;
diff --git a/sys/kern/link_elf.c b/sys/kern/link_elf.c
index 91a78bf..7a87799 100644
--- a/sys/kern/link_elf.c
+++ b/sys/kern/link_elf.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: link_elf.c,v 1.13 1999/01/27 21:49:56 dillon Exp $
+ *	$Id: link_elf.c,v 1.14 1999/01/27 23:45:39 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -931,7 +931,7 @@ static int
 link_elf_symbol_values(linker_file_t lf, c_linker_sym_t sym, linker_symval_t* symval)
 {
 	elf_file_t ef = lf->priv;
-	Elf_Sym* es = (Elf_Sym*) sym;
+	const Elf_Sym* es = (const Elf_Sym*) sym;
 
 	if (es >= ef->symtab && ((es - ef->symtab) < ef->nchains)) {
 	    symval->name = ef->strtab + es->st_name;
diff --git a/sys/kern/link_elf_obj.c b/sys/kern/link_elf_obj.c
index 91a78bf..7a87799 100644
--- a/sys/kern/link_elf_obj.c
+++ b/sys/kern/link_elf_obj.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: link_elf.c,v 1.13 1999/01/27 21:49:56 dillon Exp $
+ *	$Id: link_elf.c,v 1.14 1999/01/27 23:45:39 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -931,7 +931,7 @@ static int
 link_elf_symbol_values(linker_file_t lf, c_linker_sym_t sym, linker_symval_t* symval)
 {
 	elf_file_t ef = lf->priv;
-	Elf_Sym* es = (Elf_Sym*) sym;
+	const Elf_Sym* es = (const Elf_Sym*) sym;
 
 	if (es >= ef->symtab && ((es - ef->symtab) < ef->nchains)) {
 	    symval->name = ef->strtab + es->st_name;
diff --git a/sys/kern/subr_scanf.c b/sys/kern/subr_scanf.c
index b469d65..fac7a59 100644
--- a/sys/kern/subr_scanf.c
+++ b/sys/kern/subr_scanf.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: subr_scanf.c,v 1.1 1999/01/15 00:03:39 msmith Exp $
+ * $Id: subr_scanf.c,v 1.2 1999/01/27 21:36:14 dillon Exp $
  * From: Id: vfscanf.c,v 1.13 1998/09/25 12:20:27 obrien Exp 
  */
 
@@ -639,7 +639,7 @@ doswitch:
  * alphabets and digits are each contiguous.
  */
 u_quad_t
-strtouq(const char *nptr, char **endptr, int base)
+strtouq(const char *nptr, const char **endptr, int base)
 {
 	const char *s = nptr;
 	u_quad_t acc;
@@ -708,7 +708,7 @@ strtouq(const char *nptr, char **endptr, int base)
  * alphabets and digits are each contiguous.
  */
 quad_t
-strtoq(const char *nptr, char **endptr, int base)
+strtoq(const char *nptr, const char **endptr, int base)
 {
 	const char *s;
 	u_quad_t acc;
diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c
index 6deefed..66ddd50 100644
--- a/sys/kern/sys_pipe.c
+++ b/sys/kern/sys_pipe.c
@@ -16,7 +16,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- * $Id: sys_pipe.c,v 1.47 1999/01/27 10:10:02 bde Exp $
+ * $Id: sys_pipe.c,v 1.48 1999/01/27 21:49:57 dillon Exp $
  */
 
 /*
@@ -987,8 +987,8 @@ pipe_poll(fp, events, cred, p)
 
 	if (events & (POLLOUT | POLLWRNORM))
 		if (wpipe == NULL || (wpipe->pipe_state & PIPE_EOF) ||
-		    ((wpipe->pipe_state & PIPE_DIRECTW) == 0) &&
-		     (wpipe->pipe_buffer.size - wpipe->pipe_buffer.cnt) >= PIPE_BUF)
+		    (((wpipe->pipe_state & PIPE_DIRECTW) == 0) &&
+		     (wpipe->pipe_buffer.size - wpipe->pipe_buffer.cnt) >= PIPE_BUF))
 			revents |= events & (POLLOUT | POLLWRNORM);
 
 	if ((rpipe->pipe_state & PIPE_EOF) ||
diff --git a/sys/kern/vfs_aio.c b/sys/kern/vfs_aio.c
index 08ebd85..9eb6ee9 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.37 1999/01/21 08:29:05 dillon Exp $
+ * $Id: vfs_aio.c,v 1.38 1999/01/27 21:49:57 dillon Exp $
  */
 
 /*
@@ -359,8 +359,9 @@ aio_free_entry(struct aiocblist *aiocbe)
 	}
 
 	if ((ki->kaio_flags & KAIO_WAKEUP) ||
-		(ki->kaio_flags & KAIO_RUNDOWN) &&
-		((ki->kaio_buffer_count == 0) && (ki->kaio_queue_count == 0))) {
+	    ((ki->kaio_flags & KAIO_RUNDOWN) &&
+	    ((ki->kaio_buffer_count == 0) && 
+	    (ki->kaio_queue_count == 0)))) {
 		ki->kaio_flags &= ~KAIO_WAKEUP;
 		wakeup(p);
 	}
@@ -797,8 +798,8 @@ aio_daemon(void *uproc)
 				lj->lioj_queue_finished_count++;
 			}
 			if ((ki->kaio_flags & KAIO_WAKEUP) ||
-				(ki->kaio_flags & KAIO_RUNDOWN) &&
-				(ki->kaio_active_count == 0)) {
+			    ((ki->kaio_flags & KAIO_RUNDOWN) &&
+			    (ki->kaio_active_count == 0))) {
 				ki->kaio_flags &= ~KAIO_WAKEUP;
 				wakeup(userp);
 			}
diff --git a/sys/kern/vfs_export.c b/sys/kern/vfs_export.c
index 44b1698..23a4e83 100644
--- a/sys/kern/vfs_export.c
+++ b/sys/kern/vfs_export.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_subr.c	8.31 (Berkeley) 5/26/95
- * $Id: vfs_subr.c,v 1.182 1999/01/10 01:58:26 eivind Exp $
+ * $Id: vfs_subr.c,v 1.183 1999/01/21 08:29:05 dillon Exp $
  */
 
 /*
@@ -1594,7 +1594,7 @@ vclean(vp, flags, p)
 	 * Clean out any buffers associated with the vnode.
 	 */
 	vinvalbuf(vp, V_SAVE, NOCRED, p, 0, 0);
-	if (obj = vp->v_object) {
+	if ((obj = vp->v_object) != NULL) {
 		if (obj->ref_count == 0) {
 			/*
 			 * This is a normal way of shutting down the object/vnode
diff --git a/sys/kern/vfs_init.c b/sys/kern/vfs_init.c
index 43589c74..3b8715b 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.40 1998/11/15 15:18:30 bde Exp $
+ * $Id: vfs_init.c,v 1.41 1998/12/07 21:58:30 archie Exp $
  */
 
 
@@ -86,7 +86,7 @@ struct vm_zone *namei_zone;
  */
 
 /* Table of known vnodeop vectors (list of VFS vnode vectors) */
-static struct vnodeopv_desc **vnodeopv_descs;
+static const struct vnodeopv_desc **vnodeopv_descs;
 static int vnodeopv_num;
 
 /* Table of known descs (list of vnode op handlers "vop_access_desc") */
@@ -102,7 +102,7 @@ vfs_opv_recalc(void)
 	vop_t ***opv_desc_vector_p;
 	vop_t **opv_desc_vector;
 	struct vnodeopv_entry_desc *opve_descp;
-	struct vnodeopv_desc *opv;
+	const struct vnodeopv_desc *opv;
 
 	if (vfs_op_descs == NULL)
 		panic("vfs_opv_recalc called with null vfs_op_descs");
@@ -154,18 +154,18 @@ vfs_opv_recalc(void)
 }
 
 void
-vfs_add_vnodeops(void *data)
+vfs_add_vnodeops(const void *data)
 {
-	struct vnodeopv_desc *opv;
-	struct vnodeopv_desc **newopv;
+	const struct vnodeopv_desc *opv;
+	const struct vnodeopv_desc **newopv;
 	struct vnodeop_desc **newop;
 	int *newref;
 	vop_t **opv_desc_vector;
 	struct vnodeop_desc *desc;
 	int i, j;
 
-	opv = (struct vnodeopv_desc *)data;
-	MALLOC(newopv, struct vnodeopv_desc **,
+	opv = (const struct vnodeopv_desc *)data;
+	MALLOC(newopv, const struct vnodeopv_desc **,
 	       (vnodeopv_num + 1) * sizeof(*newopv), M_VNODE, M_WAITOK);
 	if (newopv == NULL)
 		panic("vfs_add_vnodeops: no memory");
@@ -221,10 +221,10 @@ vfs_add_vnodeops(void *data)
 }
 
 void
-vfs_rm_vnodeops(void *data)
+vfs_rm_vnodeops(const void *data)
 {
-	struct vnodeopv_desc *opv;
-	struct vnodeopv_desc **newopv;
+	const struct vnodeopv_desc *opv;
+	const struct vnodeopv_desc **newopv;
 	struct vnodeop_desc **newop;
 	int *newref;
 	vop_t **opv_desc_vector;
@@ -283,7 +283,7 @@ vfs_rm_vnodeops(void *data)
 	}
 	if (i == vnodeopv_num)
 		panic("vfs_remove_vnodeops: opv not found");
-	MALLOC(newopv, struct vnodeopv_desc **,
+	MALLOC(newopv, const struct vnodeopv_desc **,
 	       (vnodeopv_num - 1) * sizeof(*newopv), M_VNODE, M_WAITOK);
 	if (newopv == NULL)
 		panic("vfs_remove_vnodeops: no memory");
diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c
index 30b28a7..cb418ee 100644
--- a/sys/kern/vfs_lookup.c
+++ b/sys/kern/vfs_lookup.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_lookup.c	8.4 (Berkeley) 2/16/94
- * $Id: vfs_lookup.c,v 1.31 1999/01/10 01:58:26 eivind Exp $
+ * $Id: vfs_lookup.c,v 1.32 1999/01/27 21:49:58 dillon Exp $
  */
 
 #include "opt_ktrace.h"
@@ -642,7 +642,7 @@ relookup(dvp, vpp, cnp)
 	/*
 	 * We now have a segment name to search for, and a directory to search.
 	 */
-	if (error = VOP_LOOKUP(dp, vpp, cnp)) {
+	if ((error = VOP_LOOKUP(dp, vpp, cnp)) != 0) {
 		KASSERT(*vpp == NULL, ("leaf should be empty"));
 		if (error != EJUSTRETURN)
 			goto bad;
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index 44b1698..23a4e83 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_subr.c	8.31 (Berkeley) 5/26/95
- * $Id: vfs_subr.c,v 1.182 1999/01/10 01:58:26 eivind Exp $
+ * $Id: vfs_subr.c,v 1.183 1999/01/21 08:29:05 dillon Exp $
  */
 
 /*
@@ -1594,7 +1594,7 @@ vclean(vp, flags, p)
 	 * Clean out any buffers associated with the vnode.
 	 */
 	vinvalbuf(vp, V_SAVE, NOCRED, p, 0, 0);
-	if (obj = vp->v_object) {
+	if ((obj = vp->v_object) != NULL) {
 		if (obj->ref_count == 0) {
 			/*
 			 * This is a normal way of shutting down the object/vnode