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

    kernel compile

3 files changed, 24 insertions, 24 deletions

diff --git a/sys/ufs/ffs/ffs_balloc.c b/sys/ufs/ffs/ffs_balloc.c
index 6153766..2410b92 100644
--- a/sys/ufs/ffs/ffs_balloc.c
+++ b/sys/ufs/ffs/ffs_balloc.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_balloc.c	8.8 (Berkeley) 6/16/95
- * $Id: ffs_balloc.c,v 1.20 1998/03/08 09:58:47 julian Exp $
+ * $Id: ffs_balloc.c,v 1.21 1998/09/12 14:46:15 bde Exp $
  */
 
 #include <sys/param.h>
@@ -184,7 +184,7 @@ ffs_balloc(ap)
 	 * Determine the number of levels of indirection.
 	 */
 	pref = 0;
-	if (error = ufs_getlbns(vp, lbn, indirs, &num))
+	if ((error = ufs_getlbns(vp, lbn, indirs, &num)) != 0)
 		return(error);
 #ifdef DIAGNOSTIC
 	if (num < 1)
@@ -199,8 +199,8 @@ ffs_balloc(ap)
 	allocblk = allociblk;
 	if (nb == 0) {
 		pref = ffs_blkpref(ip, lbn, 0, (ufs_daddr_t *)0);
-	        if (error = ffs_alloc(ip, lbn, pref, (int)fs->fs_bsize,
-		    cred, &newb))
+	        if ((error = ffs_alloc(ip, lbn, pref, (int)fs->fs_bsize,
+		    cred, &newb)) != 0)
 			return (error);
 		nb = newb;
 		*allocblk++ = nb;
@@ -216,7 +216,7 @@ ffs_balloc(ap)
 			 * Write synchronously so that indirect blocks
 			 * never point at garbage.
 			 */
-			if (error = bwrite(bp))
+			if ((error = bwrite(bp)) != 0)
 				goto fail;
 		}
 		allocib = &ip->i_ib[indirs[0].in_off];
@@ -244,8 +244,8 @@ ffs_balloc(ap)
 		}
 		if (pref == 0)
 			pref = ffs_blkpref(ip, lbn, 0, (ufs_daddr_t *)0);
-		if (error =
-		    ffs_alloc(ip, lbn, pref, (int)fs->fs_bsize, cred, &newb)) {
+		if ((error =
+		    ffs_alloc(ip, lbn, pref, (int)fs->fs_bsize, cred, &newb)) != 0) {
 			brelse(bp);
 			goto fail;
 		}
@@ -263,7 +263,7 @@ ffs_balloc(ap)
 			 * Write synchronously so that indirect blocks
 			 * never point at garbage.
 			 */
-			if (error = bwrite(nbp)) {
+			if ((error = bwrite(nbp)) != 0) {
 				brelse(bp);
 				goto fail;
 			}
diff --git a/sys/ufs/ffs/ffs_inode.c b/sys/ufs/ffs/ffs_inode.c
index b474bc5..8821440 100644
--- a/sys/ufs/ffs/ffs_inode.c
+++ b/sys/ufs/ffs/ffs_inode.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_inode.c	8.13 (Berkeley) 4/21/95
- * $Id: ffs_inode.c,v 1.51 1999/01/06 18:18:06 bde Exp $
+ * $Id: ffs_inode.c,v 1.52 1999/01/07 16:14:16 bde Exp $
  */
 
 #include "opt_quota.h"
@@ -490,8 +490,8 @@ ffs_indirtrunc(ip, lbn, dbn, lastbn, level, countp)
 		if (nb == 0)
 			continue;
 		if (level > SINGLE) {
-			if (error = ffs_indirtrunc(ip, nlbn, fsbtodb(fs, nb),
-			    (ufs_daddr_t)-1, level - 1, &blkcount))
+			if ((error = ffs_indirtrunc(ip, nlbn, fsbtodb(fs, nb),
+			    (ufs_daddr_t)-1, level - 1, &blkcount)) != 0)
 				allerror = error;
 			blocksreleased += blkcount;
 		}
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c
index 2973703..cffe980 100644
--- a/sys/ufs/ffs/ffs_vfsops.c
+++ b/sys/ufs/ffs/ffs_vfsops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_vfsops.c	8.31 (Berkeley) 5/20/95
- * $Id: ffs_vfsops.c,v 1.94 1999/01/05 18:50:03 eivind Exp $
+ * $Id: ffs_vfsops.c,v 1.95 1999/01/07 16:14:17 bde Exp $
  */
 
 #include "opt_quota.h"
@@ -221,8 +221,8 @@ ffs_mount( mp, path, data, ndp, p)
 			 */
 			if (p->p_ucred->cr_uid != 0) {
 				vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY, p);
-				if (error = VOP_ACCESS(devvp, VREAD | VWRITE,
-				    p->p_ucred, p)) {
+				if ((error = VOP_ACCESS(devvp, VREAD | VWRITE,
+				    p->p_ucred, p)) != 0) {
 					VOP_UNLOCK(devvp, 0, p);
 					return (error);
 				}
@@ -305,7 +305,7 @@ ffs_mount( mp, path, data, ndp, p)
 		if ((mp->mnt_flag & MNT_RDONLY) == 0)
 			accessmode |= VWRITE;
 		vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY, p);
-		if (error = VOP_ACCESS(devvp, accessmode, p->p_ucred, p)) {
+		if ((error = VOP_ACCESS(devvp, accessmode, p->p_ucred, p)) != 0) {
 			vput(devvp);
 			return (error);
 		}
@@ -472,7 +472,7 @@ ffs_reload(mp, cred, p)
 		size = DEV_BSIZE;
 	else
 		size = dpart.disklab->d_secsize;
-	if (error = bread(devvp, (ufs_daddr_t)(SBOFF/size), SBSIZE, NOCRED,&bp))
+	if ((error = bread(devvp, (ufs_daddr_t)(SBOFF/size), SBSIZE, NOCRED,&bp)) != 0)
 		return (error);
 	newfs = (struct fs *)bp->b_data;
 	if (newfs->fs_magic != FS_MAGIC || newfs->fs_bsize > MAXBSIZE ||
@@ -634,7 +634,7 @@ ffs_mountfs(devvp, mp, p, malloctype)
 
 	bp = NULL;
 	ump = NULL;
-	if (error = bread(devvp, SBLOCK, SBSIZE, cred, &bp))
+	if ((error = bread(devvp, SBLOCK, SBSIZE, cred, &bp)) != 0)
 		goto out;
 	fs = (struct fs *)bp->b_data;
 	if (fs->fs_magic != FS_MAGIC || fs->fs_bsize > MAXBSIZE ||
@@ -693,8 +693,8 @@ ffs_mountfs(devvp, mp, p, malloctype)
 		size = fs->fs_bsize;
 		if (i + fs->fs_frag > blks)
 			size = (blks - i) * fs->fs_fsize;
-		if (error = bread(devvp, fsbtodb(fs, fs->fs_csaddr + i), size,
-		    cred, &bp)) {
+		if ((error = bread(devvp, fsbtodb(fs, fs->fs_csaddr + i), size,
+		    cred, &bp)) != 0) {
 			free(base, M_UFSMNT);
 			goto out;
 		}
@@ -973,9 +973,9 @@ loop:
 		simple_lock(&vp->v_interlock);
 		nvp = vp->v_mntvnodes.le_next;
 		ip = VTOI(vp);
-		if ((vp->v_type == VNON) || ((ip->i_flag &
+		if ((vp->v_type == VNON) || (((ip->i_flag &
 		     (IN_ACCESS | IN_CHANGE | IN_MODIFIED | IN_UPDATE)) == 0) &&
-		    (TAILQ_EMPTY(&vp->v_dirtyblkhd) || (waitfor == MNT_LAZY))) {
+		    (TAILQ_EMPTY(&vp->v_dirtyblkhd) || (waitfor == MNT_LAZY)))) {
 			simple_unlock(&vp->v_interlock);
 			continue;
 		}
@@ -989,7 +989,7 @@ loop:
 					goto loop;
 				continue;
 			}
-			if (error = VOP_FSYNC(vp, cred, waitfor, p))
+			if ((error = VOP_FSYNC(vp, cred, waitfor, p)) != 0)
 				allerror = error;
 			VOP_UNLOCK(vp, 0, p);
 			vrele(vp);
@@ -1264,7 +1264,7 @@ ffs_sbupdate(mp, waitfor)
 		space += size;
 		if (waitfor != MNT_WAIT)
 			bawrite(bp);
-		else if (error = bwrite(bp))
+		else if ((error = bwrite(bp)) != 0)
 			allerror = error;
 	}
 	/*
@@ -1294,7 +1294,7 @@ ffs_sbupdate(mp, waitfor)
 	dfs->fs_maxfilesize = mp->um_savedmaxfilesize;		/* XXX */
 	if (waitfor != MNT_WAIT)
 		bawrite(bp);
-	else if (error = bwrite(bp))
+	else if ((error = bwrite(bp)) != 0)
 		allerror = error;
 	return (allerror);
 }