Sync to NetBSD; some extra KNF

1 files changed, 53 insertions, 49 deletions

diff --git a/sys/isofs/cd9660/cd9660_vfsops.c b/sys/isofs/cd9660/cd9660_vfsops.c
index 222a037cfac..8978dd8f650 100644
--- a/sys/isofs/cd9660/cd9660_vfsops.c
+++ b/sys/isofs/cd9660/cd9660_vfsops.c
@@ -1,5 +1,5 @@
-/*	$OpenBSD: cd9660_vfsops.c,v 1.11 1997/11/06 05:58:11 csapuntz Exp $	*/
-/*	$NetBSD: cd9660_vfsops.c,v 1.20 1996/02/09 21:32:08 christos Exp $	*/
+/*	$OpenBSD: cd9660_vfsops.c,v 1.12 1997/11/08 17:21:08 niklas Exp $	*/
+/*	$NetBSD: cd9660_vfsops.c,v 1.26 1997/06/13 15:38:58 pk Exp $	*/
 
 /*-
  * Copyright (c) 1994
@@ -60,6 +60,7 @@
 #define	b_cylin	b_resid
 
 #include <isofs/cd9660/iso.h>
+#include <isofs/cd9660/cd9660_extern.h>
 #include <isofs/cd9660/iso_rrip.h>
 #include <isofs/cd9660/cd9660_node.h>
 
@@ -82,10 +83,10 @@ struct vfsops cd9660_vfsops = {
  * Called by vfs_mountroot when iso is going to be mounted as root.
  */
 
-static int iso_mountfs __P((struct vnode *devvp, struct mount *mp,
-		struct proc *p, struct iso_args *argp));
-int iso_disklabelspoof __P((dev_t dev, void (*strat) __P((struct buf *)),
-		struct disklabel *lp));
+static	int iso_mountfs __P((struct vnode *devvp, struct mount *mp,
+    struct proc *p, struct iso_args *argp));
+int	iso_disklabelspoof __P((dev_t dev, void (*strat) __P((struct buf *)),
+    struct disklabel *lp));
 
 int
 cd9660_mountroot()
@@ -105,7 +106,6 @@ cd9660_mountroot()
                 return (error);
         }
 
-
 	if ((error = vfs_rootmountalloc("cd9660", "root_device", &mp)) != 0)
 		return (error);
 	args.flags = ISOFSMNT_ROOT;
@@ -169,11 +169,11 @@ cd9660_mount(mp, path, data, ndp, p)
 
 	if (devvp->v_type != VBLK) {
 		vrele(devvp);
-		return ENOTBLK;
+		return (ENOTBLK);
 	}
 	if (major(devvp->v_rdev) >= nblkdev) {
 		vrele(devvp);
-		return ENXIO;
+		return (ENXIO);
 	}
 	if ((mp->mnt_flag & MNT_UPDATE) == 0)
 		error = iso_mountfs(devvp, mp, p, &args);
@@ -185,16 +185,16 @@ cd9660_mount(mp, path, data, ndp, p)
 	}
 	if (error) {
 		vrele(devvp);
-		return error;
+		return (error);
 	}
 	imp = VFSTOISOFS(mp);
-	(void) copyinstr(path, mp->mnt_stat.f_mntonname, MNAMELEN - 1, &size);
+	(void)copyinstr(path, mp->mnt_stat.f_mntonname, MNAMELEN - 1, &size);
 	bzero(mp->mnt_stat.f_mntonname + size, MNAMELEN - size);
-	(void) copyinstr(args.fspec, mp->mnt_stat.f_mntfromname, MNAMELEN - 1,
+	(void)copyinstr(args.fspec, mp->mnt_stat.f_mntfromname, MNAMELEN - 1,
 	    &size);
 	bzero(mp->mnt_stat.f_mntfromname + size, MNAMELEN - size);
-	(void) cd9660_statfs(mp, &mp->mnt_stat, p);
-	return 0;
+	(void)cd9660_statfs(mp, &mp->mnt_stat, p);
+	return (0);
 }
 
 /*
@@ -222,7 +222,7 @@ iso_mountfs(devvp, mp, p, argp)
 	int logical_block_size;
 	
 	if (!ronly)
-		return EROFS;
+		return (EROFS);
 	
 	/*
 	 * Disallow multiple mounts of the same device.
@@ -231,15 +231,15 @@ iso_mountfs(devvp, mp, p, argp)
 	 * Flush out any old buffers remaining from a previous use.
 	 */
 	if ((error = vfs_mountedon(devvp)) != 0)
-		return error;
+		return (error);
 	if (vcount(devvp) > 1 && devvp != rootvp)
-		return EBUSY;
+		return (EBUSY);
 	if ((error = vinvalbuf(devvp, V_SAVE, p->p_ucred, p, 0, 0)) != 0)
 		return (error);
 
 	error = VOP_OPEN(devvp, ronly ? FREAD : FREAD|FWRITE, FSCRED, p);
 	if (error)
-		return error;
+		return (error);
 	needclose = 1;
 	
 	/* This is the "logical sector size".  The standard says this
@@ -311,17 +311,16 @@ iso_mountfs(devvp, mp, p, argp)
 	isomp->im_mountp = mp;
 	isomp->im_dev = dev;
 	isomp->im_devvp = devvp;
-	
+
 	devvp->v_specmountpoint = mp;
-	
+
 	/* Check the Rock Ridge Extention support */
 	if (!(argp->flags & ISOFSMNT_NORRIP)) {
-		if ((error = bread(isomp->im_devvp,
-				   (isomp->root_extent + isonum_711(rootp->ext_attr_length)) <<
-				   (isomp->im_bshift - DEV_BSHIFT),
-				   isomp->logical_block_size, NOCRED,
-				   &bp)) != 0)
-		    goto out;
+		if ((error = bread(isomp->im_devvp, (isomp->root_extent +
+		    isonum_711(rootp->ext_attr_length)) <<
+		    (isomp->im_bshift - DEV_BSHIFT),
+		    isomp->logical_block_size, NOCRED, &bp)) != 0)
+			goto out;
 		
 		rootp = (struct iso_directory_record *)bp->b_data;
 		
@@ -339,8 +338,9 @@ iso_mountfs(devvp, mp, p, argp)
 		brelse(bp);
 		bp = NULL;
 	}
-	isomp->im_flags = argp->flags&(ISOFSMNT_NORRIP|ISOFSMNT_GENS|ISOFSMNT_EXTATT);
-	switch (isomp->im_flags&(ISOFSMNT_NORRIP|ISOFSMNT_GENS)) {
+	isomp->im_flags = argp->flags & (ISOFSMNT_NORRIP | ISOFSMNT_GENS |
+	    ISOFSMNT_EXTATT);
+	switch (isomp->im_flags & (ISOFSMNT_NORRIP | ISOFSMNT_GENS)) {
 	default:
 	    isomp->iso_ftype = ISO_FTYPE_DEFAULT;
 	    break;
@@ -352,17 +352,18 @@ iso_mountfs(devvp, mp, p, argp)
 	    break;
 	}
 	
-	return 0;
+	return (0);
 out:
 	if (bp)
 		brelse(bp);
 	if (needclose)
-		(void)VOP_CLOSE(devvp, ronly ? FREAD : FREAD|FWRITE, NOCRED, p);
+		(void)VOP_CLOSE(devvp, ronly ? FREAD : FREAD|FWRITE, NOCRED,
+		    p);
 	if (isomp) {
 		free((caddr_t)isomp, M_ISOFSMNT);
 		mp->mnt_data = (qaddr_t)0;
 	}
-	return error;
+	return (error);
 }
 
 /*
@@ -459,7 +460,7 @@ cd9660_start(mp, flags, p)
 	int flags;
 	struct proc *p;
 {
-	return 0;
+	return (0);
 }
 
 /*
@@ -479,7 +480,7 @@ cd9660_unmount(mp, mntflags, p)
 #if 0
 	mntflushbuf(mp, 0);
 	if (mntinvalbuf(mp))
-		return EBUSY;
+		return (EBUSY);
 #endif
 	if ((error = vflush(mp, NULLVP, flags)) != 0)
 		return (error);
@@ -518,7 +519,7 @@ cd9660_root(mp, vpp)
 	 * Simply tell vget, that it's a relocated directory.
 	 */
 	return (cd9660_vget_internal(mp, ino, vpp,
-				     imp->iso_ftype == ISO_FTYPE_RRIP, dp));
+	    imp->iso_ftype == ISO_FTYPE_RRIP, dp));
 }
 
 /*
@@ -564,11 +565,12 @@ cd9660_statfs(mp, sbp, p)
 	sbp->f_ffree = 0; /* free file nodes */
 	if (sbp != &mp->mnt_stat) {
 		bcopy(mp->mnt_stat.f_mntonname, sbp->f_mntonname, MNAMELEN);
-		bcopy(mp->mnt_stat.f_mntfromname, sbp->f_mntfromname, MNAMELEN);
+		bcopy(mp->mnt_stat.f_mntfromname, sbp->f_mntfromname,
+		    MNAMELEN);
 	}
 	/* Use the first spare for flags: */
 	sbp->f_spare[0] = isomp->im_flags;
-	return 0;
+	return (0);
 }
 
 /* ARGSUSED */
@@ -617,8 +619,8 @@ cd9660_fhtovp(mp, fhp, nam, vpp, exflagsp, credanonp)
 	int error;
 	
 #ifdef	ISOFS_DBG
-	printf("fhtovp: ino %d, start %ld\n",
-	       ifhp->ifid_ino, ifhp->ifid_start);
+	printf("fhtovp: ino %d, start %ld\n", ifhp->ifid_ino,
+	    ifhp->ifid_start);
 #endif
 	
 	/*
@@ -659,11 +661,11 @@ cd9660_vget(mp, ino, vpp)
 	 */
 	return (cd9660_vget_internal(mp, ino, vpp,
 #if 0
-				     VFSTOISOFS(mp)->iso_ftype == ISO_FTYPE_RRIP,
+	    VFSTOISOFS(mp)->iso_ftype == ISO_FTYPE_RRIP,
 #else
-				     0,
+	    0,
 #endif
-				     NULL));
+	    NULL));
 }
 
 int
@@ -719,10 +721,11 @@ cd9660_vget_internal(mp, ino, vpp, relocated, isodir)
 		}
 	
 		off = blkoff(imp, ino);
-		if (off + ISO_DIRECTORY_RECORD_SIZE > imp->logical_block_size) {
+		if (off + ISO_DIRECTORY_RECORD_SIZE > imp->logical_block_size)
+		    {
 			vput(vp);
 			printf("fhtovp: crosses block boundary %d\n",
-			       off + ISO_DIRECTORY_RECORD_SIZE);
+			    off + ISO_DIRECTORY_RECORD_SIZE);
 			return (ESTALE);
 		}
 	
@@ -743,8 +746,8 @@ cd9660_vget_internal(mp, ino, vpp, relocated, isodir)
 			if (bp != 0)
 				brelse(bp);
 			printf("fhtovp: directory crosses block boundary %d[off=%d/len=%d]\n",
-			       off +isonum_711(isodir->length), off,
-			       isonum_711(isodir->length));
+			    off +isonum_711(isodir->length), off,
+			    isonum_711(isodir->length));
 			return (ESTALE);
 		}
 	
@@ -754,8 +757,9 @@ cd9660_vget_internal(mp, ino, vpp, relocated, isodir)
 			if (bp != 0)
 				brelse(bp);
 			printf("fhtovp: file start miss %d vs %d\n",
-			       isonum_733(isodir->extent) + isonum_711(isodir->ext_attr_length),
-			       ifhp->ifid_start);
+			    isonum_733(isodir->extent) +
+			    isonum_711(isodir->ext_attr_length),
+			    ifhp->ifid_start);
 			return (ESTALE);
 		}
 #endif
@@ -894,7 +898,7 @@ cd9660_vptofh(vp, fhp)
 	
 #ifdef	ISOFS_DBG
 	printf("vptofh: ino %d, start %ld\n",
-	       ifhp->ifid_ino,ifhp->ifid_start);
+	    ifhp->ifid_ino,ifhp->ifid_start);
 #endif
-	return 0;
+	return (0);
 }