summaryrefslogtreecommitdiffstats
path: root/usr.sbin/makefs
diff options
context:
space:
mode:
authorkrw <krw@openbsd.org>2016-12-17 16:26:46 +0000
committerkrw <krw@openbsd.org>2016-12-17 16:26:46 +0000
commit6b392b0a589597e79f366079b366ec986133b469 (patch)
tree8f1849b60db8b29352797671f70a40e4ddaa75ba /usr.sbin/makefs
parentWhile here nuke some more annoying whitespace nits. (diff)
downloadwireguard-openbsd-6b392b0a589597e79f366079b366ec986133b469.tar.xz
wireguard-openbsd-6b392b0a589597e79f366079b366ec986133b469.zip
While here nuke some more annoying whitespace nits.
Diffstat (limited to 'usr.sbin/makefs')
-rw-r--r--usr.sbin/makefs/ffs/buf.c6
-rw-r--r--usr.sbin/makefs/ffs/ffs_alloc.c12
-rw-r--r--usr.sbin/makefs/ffs/ufs_bmap.c6
-rw-r--r--usr.sbin/makefs/ffs/ufs_inode.h4
4 files changed, 14 insertions, 14 deletions
diff --git a/usr.sbin/makefs/ffs/buf.c b/usr.sbin/makefs/ffs/buf.c
index c6ee039d38c..b9f735225af 100644
--- a/usr.sbin/makefs/ffs/buf.c
+++ b/usr.sbin/makefs/ffs/buf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: buf.c,v 1.5 2016/10/26 15:31:13 natano Exp $ */
+/* $OpenBSD: buf.c,v 1.6 2016/12/17 16:26:46 krw Exp $ */
/* $NetBSD: buf.c,v 1.24 2016/06/24 19:24:11 christos Exp $ */
/*
@@ -101,7 +101,7 @@ brelse(struct mkfsbuf *bp, int u1 __unused)
bp->b_bcount = 0;
return;
}
-
+
TAILQ_REMOVE(&buftail, bp, b_tailq);
free(bp->b_data);
free(bp);
@@ -141,7 +141,7 @@ bcleanup(void)
* know why there's still some buffers lying around that
* aren't brelse()d
*/
-
+
if (TAILQ_EMPTY(&buftail))
return;
diff --git a/usr.sbin/makefs/ffs/ffs_alloc.c b/usr.sbin/makefs/ffs/ffs_alloc.c
index 195b618b275..c3549a2fa20 100644
--- a/usr.sbin/makefs/ffs/ffs_alloc.c
+++ b/usr.sbin/makefs/ffs/ffs_alloc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ffs_alloc.c,v 1.12 2016/10/26 15:31:13 natano Exp $ */
+/* $OpenBSD: ffs_alloc.c,v 1.13 2016/12/17 16:26:46 krw Exp $ */
/* $NetBSD: ffs_alloc.c,v 1.29 2016/06/24 19:24:11 christos Exp $ */
/* From: NetBSD: ffs_alloc.c,v 1.50 2001/09/06 02:16:01 lukem Exp */
@@ -64,7 +64,7 @@ static int32_t ffs_mapsearch(struct fs *, struct cg *, daddr_t, int);
/*
* Allocate a block in the file system.
- *
+ *
* The size of the requested block is given, which must be some
* multiple of fs_fsize and <= fs_bsize.
* A preference may be optionally specified. If a preference is given
@@ -88,7 +88,7 @@ ffs_alloc(struct inode *ip, daddr_t lbn __unused, daddr_t bpref, int size,
struct fs *fs = ip->i_fs;
daddr_t bno;
int cg;
-
+
*bnp = 0;
if (size > fs->fs_bsize || fragoff(fs, size) != 0) {
errx(1, "%s: bad size: bsize %d size %d", __func__,
@@ -116,7 +116,7 @@ nospace:
* Select the desired position for the next block in a file. The file is
* logically divided into sections. The first section is composed of the
* direct blocks. Each additional section contains fs_maxbpg blocks.
- *
+ *
* If no blocks have been allocated in the first section, the policy is to
* request a block in the same cylinder group as the inode that describes
* the file. If no blocks have been allocated in any other section, the
@@ -130,7 +130,7 @@ nospace:
* indirect block, the information on the previous allocation is unavailable;
* here a best guess is made based upon the logical block number being
* allocated.
- *
+ *
* If a section is already partially allocated, the policy is to
* contiguously allocate fs_maxcontig blocks. The end of one of these
* contiguous blocks and the beginning of the next is physically separated
@@ -315,7 +315,7 @@ ffs_alloccg(struct inode *ip, int cg, daddr_t bpref, int size)
break;
if (allocsiz == fs->fs_frag) {
/*
- * no fragments were available, so a block will be
+ * no fragments were available, so a block will be
* allocated, and hacked up
*/
if (cgp->cg_cs.cs_nbfree == 0) {
diff --git a/usr.sbin/makefs/ffs/ufs_bmap.c b/usr.sbin/makefs/ffs/ufs_bmap.c
index 9da3410efd6..d33eec60e14 100644
--- a/usr.sbin/makefs/ffs/ufs_bmap.c
+++ b/usr.sbin/makefs/ffs/ufs_bmap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ufs_bmap.c,v 1.5 2016/10/22 19:43:50 natano Exp $ */
+/* $OpenBSD: ufs_bmap.c,v 1.6 2016/12/17 16:26:46 krw Exp $ */
/* $NetBSD: ufs_bmap.c,v 1.18 2013/06/19 17:51:27 dholland Exp $ */
/* From: NetBSD: ufs_bmap.c,v 1.14 2001/11/08 05:00:51 chs Exp */
@@ -81,7 +81,7 @@ ufs_getlbns(struct inode *ip, daddr_t bn, struct indir *ap, int *nump)
assert (bn >= NDADDR);
- /*
+ /*
* Determine the number of levels of indirection. After this loop
* is done, blockcnt indicates the number of data blocks possible
* at the given level of indirection, and NIADDR - i is the number
@@ -103,7 +103,7 @@ ufs_getlbns(struct inode *ip, daddr_t bn, struct indir *ap, int *nump)
/* Calculate the address of the first meta-block. */
metalbn = -((realbn >= 0 ? realbn : -realbn) - bn + NIADDR - i);
- /*
+ /*
* At each iteration, off is the offset into the bap array which is
* an array of disk addresses at the current level of indirection.
* The logical block number and the offset in that block are stored
diff --git a/usr.sbin/makefs/ffs/ufs_inode.h b/usr.sbin/makefs/ffs/ufs_inode.h
index 57455f927b4..1247ca5cbbb 100644
--- a/usr.sbin/makefs/ffs/ufs_inode.h
+++ b/usr.sbin/makefs/ffs/ufs_inode.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ufs_inode.h,v 1.3 2016/10/17 01:16:22 tedu Exp $ */
+/* $OpenBSD: ufs_inode.h,v 1.4 2016/12/17 16:26:46 krw Exp $ */
/* $NetBSD: ufs_inode.h,v 1.5 2013/01/30 19:19:19 christos Exp $ */
/* From: NetBSD: inode.h,v 1.27 2001/12/18 10:57:23 fvdl Exp $ */
@@ -44,7 +44,7 @@ union dinode {
};
struct inode {
- ino_t i_number; /* The identity of the inode. */
+ ino_t i_number; /* The identity of the inode. */
struct mkfsvnode *i_devvp; /* device mkfsvnode for block I/O */
struct fs *i_fs; /* File system */
union dinode i_din;