GAS 2.8 + KNF

2 files changed, 15 insertions, 12 deletions

diff --git a/sys/msdosfs/msdosfs_vfsops.c b/sys/msdosfs/msdosfs_vfsops.c
index 21a1c5c6b59..04413c9fb32 100644
--- a/sys/msdosfs/msdosfs_vfsops.c
+++ b/sys/msdosfs/msdosfs_vfsops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: msdosfs_vfsops.c,v 1.14 1998/02/08 22:41:44 tholo Exp $	*/
+/*	$OpenBSD: msdosfs_vfsops.c,v 1.15 1998/02/23 20:10:38 niklas Exp $	*/
 /*	$NetBSD: msdosfs_vfsops.c,v 1.48 1997/10/18 02:54:57 briggs Exp $	*/
 
 /*-
@@ -732,12 +732,13 @@ msdosfs_sync(mp, waitfor, cred, p)
 	 * If we ever switch to not updating all of the fats all the time,
 	 * this would be the place to update them from the first one.
 	 */
-	if (pmp->pm_fmod != 0)
+	if (pmp->pm_fmod != 0) {
 		if (pmp->pm_flags & MSDOSFSMNT_RONLY)
 			panic("msdosfs_sync: rofs mod");
 		else {
 			/* update fats here */
 		}
+	}
 	/*
 	 * Write back each (modified) denode.
 	 */
diff --git a/sys/msdosfs/msdosfs_vnops.c b/sys/msdosfs/msdosfs_vnops.c
index 33e123e2fca..8da82fd65ff 100644
--- a/sys/msdosfs/msdosfs_vnops.c
+++ b/sys/msdosfs/msdosfs_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: msdosfs_vnops.c,v 1.15 1998/01/11 20:39:10 provos Exp $	*/
+/*	$OpenBSD: msdosfs_vnops.c,v 1.16 1998/02/23 20:10:39 niklas Exp $	*/
 /*	$NetBSD: msdosfs_vnops.c,v 1.63 1997/10/17 11:24:19 ws Exp $	*/
 
 /*-
@@ -1664,17 +1664,18 @@ msdosfs_readdir(v)
 			if (dentp->deAttributes & ATTR_DIRECTORY) {
 				fileno = getushort(dentp->deStartCluster);
 				if (FAT32(pmp))
-				        fileno |= getushort(dentp->deHighClust) << 16;
+				        fileno |=
+					    getushort(dentp->deHighClust) <<
+					    16;
 				/* if this is the root directory */
 				if (fileno == MSDOSFSROOT)
-				        if (FAT32(pmp))
-					        fileno = cntobn(pmp,
-								pmp->pm_rootdirblk)
-						         * dirsperblk;
-					else
-					        fileno = 1;
+				        fileno = FAT32(pmp) ?
+					    cntobn(pmp, pmp->pm_rootdirblk) *
+					    dirsperblk :
+					    1;
 				else
-				        fileno = cntobn(pmp, fileno) * dirsperblk;
+				        fileno = cntobn(pmp, fileno) *
+					    dirsperblk;
 				dirbuf.d_fileno = fileno;
 				dirbuf.d_type = DT_DIR;
 			} else {
@@ -1685,7 +1686,8 @@ msdosfs_readdir(v)
 			        fileno = cntobn(pmp, cn) * dirsperblk;
 				if (cn == MSDOSFSROOT)
 				        fileno = roottobn(pmp, 0) * dirsperblk;
-				fileno += dentp - (struct direntry *)bp->b_data;
+				fileno +=
+				    dentp - (struct direntry *)bp->b_data;
 				dirbuf.d_fileno = fileno;
 				dirbuf.d_type = DT_REG;
 			}