While here nuke some more annoying whitespace nits.

7 files changed, 45 insertions, 45 deletions

diff --git a/usr.sbin/makefs/msdos/denode.h b/usr.sbin/makefs/msdos/denode.h
index 2e947ccfcfa..48cdf968945 100644
--- a/usr.sbin/makefs/msdos/denode.h
+++ b/usr.sbin/makefs/msdos/denode.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: denode.h,v 1.1 2016/10/18 17:05:30 natano Exp $	*/
+/*	$OpenBSD: denode.h,v 1.2 2016/12/17 16:43:30 krw Exp $	*/
 /*	$NetBSD: denode.h,v 1.24 2014/07/08 09:21:52 hannken Exp $	*/
 
 /*-
@@ -144,7 +144,7 @@ struct fatcache {
 		(dep)->de_fc[FC_NEXTTOLASTFC].fc_frcn = (dep)->de_fc[FC_LASTFC].fc_frcn; \
 		(dep)->de_fc[FC_NEXTTOLASTFC].fc_fsrcn = (dep)->de_fc[FC_LASTFC].fc_fsrcn; \
 	} while (0)
-	 
+
 
 /*
  * This is the in memory variant of a dos directory entry.  It is usually
diff --git a/usr.sbin/makefs/msdos/mkfs_msdos.c b/usr.sbin/makefs/msdos/mkfs_msdos.c
index b76614e6044..e4fe0856ade 100644
--- a/usr.sbin/makefs/msdos/mkfs_msdos.c
+++ b/usr.sbin/makefs/msdos/mkfs_msdos.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mkfs_msdos.c,v 1.2 2016/10/23 10:58:45 natano Exp $	*/
+/*	$OpenBSD: mkfs_msdos.c,v 1.3 2016/12/17 16:43:30 krw Exp $	*/
 /*	$NetBSD: mkfs_msdos.c,v 1.10 2016/04/03 11:00:13 mlelstv Exp $	*/
 
 /*
@@ -65,7 +65,7 @@
 #define MINCLS12  1		/* minimum FAT12 clusters */
 #define MINCLS16  0xff5		/* minimum FAT16 clusters */
 #define MINCLS32  0xfff5	/* minimum FAT32 clusters */
-#define MAXCLS12  0xff4 	/* maximum FAT12 clusters */
+#define MAXCLS12  0xff4		/* maximum FAT12 clusters */
 #define MAXCLS16  0xfff4	/* maximum FAT16 clusters */
 #define MAXCLS32  0xffffff4	/* maximum FAT32 clusters */
 
@@ -125,7 +125,7 @@ struct bsx {
     u_int8_t rsvd;		/* reserved */
     u_int8_t sig;		/* extended boot signature */
     u_int8_t volid[4];		/* volume ID number */
-    u_int8_t label[11]; 	/* volume label */
+    u_int8_t label[11];		/* volume label */
     u_int8_t type[8];		/* file system type */
 };
 
@@ -151,11 +151,11 @@ struct bpb {
     u_int spt;			/* sectors per track */
     u_int hds;			/* drive heads */
     u_int hid;			/* hidden sectors */
-    u_int bsec; 		/* big total sectors */
-    u_int bspf; 		/* big sectors per FAT */
-    u_int rdcl; 		/* root directory start cluster */
-    u_int infs; 		/* file system info sector */
-    u_int bkbs; 		/* backup boot sector */
+    u_int bsec;			/* big total sectors */
+    u_int bspf;			/* big sectors per FAT */
+    u_int rdcl;			/* root directory start cluster */
+    u_int infs;			/* file system info sector */
+    u_int bkbs;			/* backup boot sector */
 };
 
 #define INIT(a, b, c, d, e, f, g, h, i, j) \
@@ -169,35 +169,35 @@ static struct {
     {"180",  INIT(512, 1, 1, 2,  64,  360, 0xfc, 2,  9, 1)},
     {"320",  INIT(512, 2, 1, 2, 112,  640, 0xff, 1,  8, 2)},
     {"360",  INIT(512, 2, 1, 2, 112,  720, 0xfd, 2,  9, 2)},
-    {"640",  INIT(512, 2, 1, 2, 112, 1280, 0xfb, 2,  8, 2)},    
+    {"640",  INIT(512, 2, 1, 2, 112, 1280, 0xfb, 2,  8, 2)},
     {"720",  INIT(512, 2, 1, 2, 112, 1440, 0xf9, 3,  9, 2)},
     {"1200", INIT(512, 1, 1, 2, 224, 2400, 0xf9, 7, 15, 2)},
-    {"1232", INIT(1024,1, 1, 2, 192, 1232, 0xfe, 2,  8, 2)},    
+    {"1232", INIT(1024,1, 1, 2, 192, 1232, 0xfe, 2,  8, 2)},
     {"1440", INIT(512, 1, 1, 2, 224, 2880, 0xf0, 9, 18, 2)},
     {"2880", INIT(512, 2, 1, 2, 240, 5760, 0xf0, 9, 36, 2)}
 };
 
 static u_int8_t bootcode[] = {
     0xfa,			/* cli		    */
-    0x31, 0xc0, 		/* xor	   ax,ax    */
-    0x8e, 0xd0, 		/* mov	   ss,ax    */
+    0x31, 0xc0,			/* xor	   ax,ax    */
+    0x8e, 0xd0,			/* mov	   ss,ax    */
     0xbc, 0x00, 0x7c,		/* mov	   sp,7c00h */
     0xfb,			/* sti		    */
-    0x8e, 0xd8, 		/* mov	   ds,ax    */
+    0x8e, 0xd8,			/* mov	   ds,ax    */
     0xe8, 0x00, 0x00,		/* call    $ + 3    */
     0x5e,			/* pop	   si	    */
     0x83, 0xc6, 0x19,		/* add	   si,+19h  */
     0xbb, 0x07, 0x00,		/* mov	   bx,0007h */
     0xfc,			/* cld		    */
     0xac,			/* lodsb	    */
-    0x84, 0xc0, 		/* test    al,al    */
-    0x74, 0x06, 		/* jz	   $ + 8    */
-    0xb4, 0x0e, 		/* mov	   ah,0eh   */
-    0xcd, 0x10, 		/* int	   10h	    */
-    0xeb, 0xf5, 		/* jmp	   $ - 9    */
-    0x30, 0xe4, 		/* xor	   ah,ah    */
-    0xcd, 0x16, 		/* int	   16h	    */
-    0xcd, 0x19, 		/* int	   19h	    */
+    0x84, 0xc0,			/* test    al,al    */
+    0x74, 0x06,			/* jz	   $ + 8    */
+    0xb4, 0x0e,			/* mov	   ah,0eh   */
+    0xcd, 0x10,			/* int	   10h	    */
+    0xeb, 0xf5,			/* jmp	   $ - 9    */
+    0x30, 0xe4,			/* xor	   ah,ah    */
+    0xcd, 0x16,			/* int	   16h	    */
+    0xcd, 0x19,			/* int	   19h	    */
     0x0d, 0x0a,
     'N', 'o', 'n', '-', 's', 'y', 's', 't',
     'e', 'm', ' ', 'd', 'i', 's', 'k',
diff --git a/usr.sbin/makefs/msdos/mkfs_msdos.h b/usr.sbin/makefs/msdos/mkfs_msdos.h
index eb839569dc9..d576b52099a 100644
--- a/usr.sbin/makefs/msdos/mkfs_msdos.h
+++ b/usr.sbin/makefs/msdos/mkfs_msdos.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mkfs_msdos.h,v 1.5 2016/10/26 07:53:47 natano Exp $	*/
+/*	$OpenBSD: mkfs_msdos.h,v 1.6 2016/12/17 16:43:30 krw Exp $	*/
 /*	$NetBSD: mkfs_msdos.h,v 1.3 2015/10/16 17:38:17 christos Exp $	*/
 
 /*-
@@ -59,7 +59,7 @@ AOPT(char *, volume_label, -1)
 struct msdos_options {
 #define AOPT(_type, _name, _min) _type _name;
 ALLOPTS
-#undef AOPT	
+#undef AOPT
 	uint32_t volume_id_set:1;
 	uint32_t media_descriptor_set:1;
 	uint32_t hidden_sectors_set:1;
diff --git a/usr.sbin/makefs/msdos/msdosfs_fat.c b/usr.sbin/makefs/msdos/msdosfs_fat.c
index 97fe5371564..c2fb2db6c42 100644
--- a/usr.sbin/makefs/msdos/msdosfs_fat.c
+++ b/usr.sbin/makefs/msdos/msdosfs_fat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: msdosfs_fat.c,v 1.3 2016/10/22 22:20:24 natano Exp $	*/
+/*	$OpenBSD: msdosfs_fat.c,v 1.4 2016/12/17 16:43:30 krw Exp $	*/
 /*	$NetBSD: msdosfs_fat.c,v 1.31 2016/05/07 16:43:02 mlelstv Exp $	*/
 
 /*-
@@ -458,7 +458,7 @@ updatefats(struct msdosfsmount *pmp, struct mkfsbuf *bp, u_long fatbn)
  *	+----+----+----+   +----+----+----+
  *	|  3    0    1 |   |  4    5    2 |
  *	+----+----+----+   +----+----+----+
- *	cluster n  	   cluster n+1
+ *	cluster n	   cluster n+1
  *
  * Where n is even. m = n + (n >> 2)
  *
diff --git a/usr.sbin/makefs/msdos/msdosfs_unicode.c b/usr.sbin/makefs/msdos/msdosfs_unicode.c
index dec0bb9934c..bb30ac57e3a 100644
--- a/usr.sbin/makefs/msdos/msdosfs_unicode.c
+++ b/usr.sbin/makefs/msdos/msdosfs_unicode.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: msdosfs_unicode.c,v 1.1 2016/10/18 17:05:30 natano Exp $	*/
+/*	$OpenBSD: msdosfs_unicode.c,v 1.2 2016/12/17 16:43:30 krw Exp $	*/
 /*	$NetBSD: msdosfs_unicode.c,v 1.2 2016/02/06 14:11:58 joerg Exp $	*/
 
 /*
@@ -14,11 +14,11 @@
  * For documentation, see UCD.html
  *
  * COPYRIGHT AND PERMISSION NOTICE
- * 
+ *
  * Copyright © 1991-2015 Unicode, Inc. All rights reserved.
- * Distributed under the Terms of Use in 
+ * Distributed under the Terms of Use in
  * http://www.unicode.org/copyright.html.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of the Unicode data files and any associated documentation
  * (the "Data Files") or Unicode software and any associated documentation
@@ -27,14 +27,14 @@
  * copy, modify, merge, publish, distribute, and/or sell copies of
  * the Data Files or Software, and to permit persons to whom the Data Files
  * or Software are furnished to do so, provided that
- * (a) this copyright and permission notice appear with all copies 
+ * (a) this copyright and permission notice appear with all copies
  * of the Data Files or Software,
- * (b) this copyright and permission notice appear in associated 
+ * (b) this copyright and permission notice appear in associated
  * documentation, and
  * (c) there is clear notice in each modified Data File or in the Software
  * as well as in the documentation associated with the Data File(s) or
  * Software that the data or software has been modified.
- * 
+ *
  * THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
  * ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
  * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -45,12 +45,12 @@
  * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THE DATA FILES OR SOFTWARE.
- * 
+ *
  * Except as contained in this notice, the name of a copyright holder
  * shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in these Data Files or Software without prior
  * written authorization of the copyright holder.
- * 
+ *
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/makefs/msdos/msdosfs_vfsops.c b/usr.sbin/makefs/msdos/msdosfs_vfsops.c
index 2125fdf82fc..4af65f5fe63 100644
--- a/usr.sbin/makefs/msdos/msdosfs_vfsops.c
+++ b/usr.sbin/makefs/msdos/msdosfs_vfsops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: msdosfs_vfsops.c,v 1.10 2016/10/23 11:09:38 natano Exp $	*/
+/*	$OpenBSD: msdosfs_vfsops.c,v 1.11 2016/12/17 16:43:30 krw Exp $	*/
 
 /*-
  * Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
@@ -101,7 +101,7 @@ msdosfs_mount(struct mkfsvnode *devvp, int flags)
 
 	if (bsp->bs50.bsBootSectSig0 != BOOTSIG0
 	    || bsp->bs50.bsBootSectSig1 != BOOTSIG1) {
-		DPRINTF(("bootsig0 %d bootsig1 %d\n", 
+		DPRINTF(("bootsig0 %d bootsig1 %d\n",
 		    bsp->bs50.bsBootSectSig0,
 		    bsp->bs50.bsBootSectSig1));
 		error = EINVAL;
@@ -138,10 +138,10 @@ msdosfs_mount(struct mkfsvnode *devvp, int flags)
 	    pmp->pm_RootDirEnts, pmp->pm_Sectors, pmp->pm_FATsecs,
 	    pmp->pm_SecPerTrack, pmp->pm_Heads, pmp->pm_Media));
 	/* XXX - We should probably check more values here */
-    	if (!pmp->pm_BytesPerSec || !SecPerClust
-    		|| pmp->pm_SecPerTrack > 63) {
+	if (!pmp->pm_BytesPerSec || !SecPerClust
+		|| pmp->pm_SecPerTrack > 63) {
 		DPRINTF(("bytespersec %d secperclust %d "
-		    "secpertrack %d\n", 
+		    "secpertrack %d\n",
 		    pmp->pm_BytesPerSec, SecPerClust,
 		    pmp->pm_SecPerTrack));
 		error = EINVAL;
@@ -257,7 +257,7 @@ msdosfs_mount(struct mkfsvnode *devvp, int flags)
 	 * must be a power of 2
 	 */
 	if (pmp->pm_bpcluster ^ (1 << pmp->pm_cnshift)) {
-		DPRINTF(("bpcluster %lu cnshift %lu\n", 
+		DPRINTF(("bpcluster %lu cnshift %lu\n",
 		    pmp->pm_bpcluster, pmp->pm_cnshift));
 		error = EINVAL;
 		goto error_exit;
diff --git a/usr.sbin/makefs/msdos/msdosfs_vnops.c b/usr.sbin/makefs/msdos/msdosfs_vnops.c
index 00771e57bd9..7a0e5996a00 100644
--- a/usr.sbin/makefs/msdos/msdosfs_vnops.c
+++ b/usr.sbin/makefs/msdos/msdosfs_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: msdosfs_vnops.c,v 1.7 2016/10/22 22:20:24 natano Exp $	*/
+/*	$OpenBSD: msdosfs_vnops.c,v 1.8 2016/12/17 16:43:30 krw Exp $	*/
 /*	$NetBSD: msdosfs_vnops.c,v 1.17 2016/01/30 09:59:27 mlelstv Exp $ */
 
 /*-
@@ -115,7 +115,7 @@ msdosfs_times(struct msdosfsmount *pmp, struct denode *dep,
  * memory denode's will be in synch.
  */
 static int
-msdosfs_findslot(struct denode *dp, struct componentname *cnp) 
+msdosfs_findslot(struct denode *dp, struct componentname *cnp)
 {
 	daddr_t bn;
 	int error;
@@ -473,7 +473,7 @@ msdosfs_wfile(const char *path, struct denode *dep, fsnode *node)
 		    0, &bp)) != 0) {
 			DPRINTF(("bread %d\n", error));
 			goto out;
-		} 
+		}
 		cpsize = MIN((nsize - offs), blsize - on);
 		memcpy((char *)bp->b_data + on, dat + offs, cpsize);
 		bwrite(bp);