Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/usr.sbin/makefs makefs(8): Nix trailing whitespace.
details: https://anonhg.NetBSD.org/src/rev/c90d0365acad
branches: trunk
changeset: 364723:c90d0365acad
user: riastradh <riastradh%NetBSD.org@localhost>
date: Sat Apr 09 10:05:35 2022 +0000
description:
makefs(8): Nix trailing whitespace.
Computed by machine, eyeballed by hand, so to speak.
diffstat:
usr.sbin/makefs/cd9660/cd9660_archimedes.c | 6 +++---
usr.sbin/makefs/cd9660/cd9660_archimedes.h | 4 ++--
usr.sbin/makefs/cd9660/cd9660_eltorito.c | 14 +++++++-------
usr.sbin/makefs/chfs.c | 13 ++++++-------
usr.sbin/makefs/chfs/chfs_mkfs.c | 10 +++++-----
usr.sbin/makefs/ffs.c | 12 ++++++------
usr.sbin/makefs/ffs/buf.c | 8 ++++----
usr.sbin/makefs/ffs/ffs_alloc.c | 16 ++++++++--------
usr.sbin/makefs/ffs/ffs_extern.h | 4 ++--
usr.sbin/makefs/ffs/ufs_bmap.c | 8 ++++----
usr.sbin/makefs/makefs.c | 12 ++++++------
usr.sbin/makefs/makefs.h | 4 ++--
usr.sbin/makefs/msdos.c | 12 ++++++------
usr.sbin/makefs/msdos/msdosfs_vfsops.c | 8 ++++----
usr.sbin/makefs/msdos/msdosfs_vnops.c | 10 +++++-----
usr.sbin/makefs/udf.c | 13 ++++++-------
usr.sbin/makefs/udf/cdio_mmc_structs.h | 8 ++++----
usr.sbin/makefs/walk.c | 12 ++++++------
18 files changed, 86 insertions(+), 88 deletions(-)
diffs (truncated from 755 to 300 lines):
diff -r 5853c8cfbc2c -r c90d0365acad usr.sbin/makefs/cd9660/cd9660_archimedes.c
--- a/usr.sbin/makefs/cd9660/cd9660_archimedes.c Sat Apr 09 09:59:16 2022 +0000
+++ b/usr.sbin/makefs/cd9660/cd9660_archimedes.c Sat Apr 09 10:05:35 2022 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cd9660_archimedes.c,v 1.2 2013/01/28 21:03:28 christos Exp $ */
+/* $NetBSD: cd9660_archimedes.c,v 1.3 2022/04/09 10:05:35 riastradh Exp $ */
/*-
* Copyright (c) 1998, 2009 Ben Harris
@@ -14,7 +14,7 @@
* documentation and/or other materials provided with the distribution.
* 3. The name of the author may not be used to endorse or promote products
* derived from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
@@ -43,7 +43,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: cd9660_archimedes.c,v 1.2 2013/01/28 21:03:28 christos Exp $");
+__RCSID("$NetBSD: cd9660_archimedes.c,v 1.3 2022/04/09 10:05:35 riastradh Exp $");
#endif /* !__lint */
#include <assert.h>
diff -r 5853c8cfbc2c -r c90d0365acad usr.sbin/makefs/cd9660/cd9660_archimedes.h
--- a/usr.sbin/makefs/cd9660/cd9660_archimedes.h Sat Apr 09 09:59:16 2022 +0000
+++ b/usr.sbin/makefs/cd9660/cd9660_archimedes.h Sat Apr 09 10:05:35 2022 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cd9660_archimedes.h,v 1.1 2009/01/10 22:06:29 bjh21 Exp $ */
+/* $NetBSD: cd9660_archimedes.h,v 1.2 2022/04/09 10:05:35 riastradh Exp $ */
/*-
* Copyright (c) 1998, 2009 Ben Harris
@@ -14,7 +14,7 @@
* documentation and/or other materials provided with the distribution.
* 3. The name of the author may not be used to endorse or promote products
* derived from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
diff -r 5853c8cfbc2c -r c90d0365acad usr.sbin/makefs/cd9660/cd9660_eltorito.c
--- a/usr.sbin/makefs/cd9660/cd9660_eltorito.c Sat Apr 09 09:59:16 2022 +0000
+++ b/usr.sbin/makefs/cd9660/cd9660_eltorito.c Sat Apr 09 10:05:35 2022 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cd9660_eltorito.c,v 1.24 2020/11/15 00:18:48 jmcneill Exp $ */
+/* $NetBSD: cd9660_eltorito.c,v 1.25 2022/04/09 10:05:35 riastradh Exp $ */
/*
* Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan
@@ -40,7 +40,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: cd9660_eltorito.c,v 1.24 2020/11/15 00:18:48 jmcneill Exp $");
+__RCSID("$NetBSD: cd9660_eltorito.c,v 1.25 2022/04/09 10:05:35 riastradh Exp $");
#endif /* !__lint */
#ifdef DEBUG
@@ -385,7 +385,7 @@
* X86 system type if not found.
*/
system = default_boot_image != NULL ? default_boot_image->system :
- ET_SYS_X86;
+ ET_SYS_X86;
/* Step 1: Generate boot catalog */
/* Step 1a: Validation entry */
@@ -547,7 +547,7 @@
if (fseeko(fd, (off_t)(idx) * 16 + 0x1be, SEEK_SET) == -1)
err(1, "fseeko");
-
+
val = 0x80; /* Bootable */
fwrite(&val, sizeof(val), 1, fd);
@@ -618,7 +618,7 @@
apm32 = 0;
/* pmLgDataStart */
fwrite(&apm32, sizeof(apm32), 1, fd);
- /* pmDataCnt */
+ /* pmDataCnt */
apm32 = htobe32(nsectors);
fwrite(&apm32, sizeof(apm32), 1, fd);
/* pmPartStatus */
@@ -667,9 +667,9 @@
}
cd9660_copy_file(diskStructure, fd, t->sector, t->filename);
- if (t->system == ET_SYS_MAC)
+ if (t->system == ET_SYS_MAC)
apm_partitions++;
- if (t->system == ET_SYS_PPC)
+ if (t->system == ET_SYS_PPC)
mbr_partitions++;
}
diff -r 5853c8cfbc2c -r c90d0365acad usr.sbin/makefs/chfs.c
--- a/usr.sbin/makefs/chfs.c Sat Apr 09 09:59:16 2022 +0000
+++ b/usr.sbin/makefs/chfs.c Sat Apr 09 10:05:35 2022 +0000
@@ -102,7 +102,7 @@
assert(image != NULL);
assert(dir != NULL);
assert(root != NULL);
- assert(fsopts != NULL);
+ assert(fsopts != NULL);
TIMER_START(start);
chfs_validate(dir, root, fsopts);
@@ -114,7 +114,7 @@
errx(EXIT_FAILURE, "Image file `%s' not created", image);
}
TIMER_RESULTS(start, "chfs_create_image");
-
+
fsopts->curinode = CHFS_ROOTINO;
root->inode->ino = CHFS_ROOTINO;
@@ -162,7 +162,7 @@
{
assert(image != NULL);
assert(fsopts != NULL);
-
+
if ((fsopts->fd = open(image, O_RDWR | O_CREAT | O_TRUNC, 0666)) == -1) {
warn("Can't open `%s' for writing", image);
return -1;
@@ -180,8 +180,8 @@
assert(dir != NULL);
assert(root != NULL);
- assert(fsopts != NULL);
-
+ assert(fsopts != NULL);
+
for (cur = root->next; cur != NULL; cur = cur->next) {
if ((cur->inode->flags & FI_ALLOCATED) == 0) {
cur->inode->flags |= FI_ALLOCATED;
@@ -203,7 +203,7 @@
write_file(fsopts, cur, dir);
}
}
-
+
for (cur = root; cur != NULL; cur = cur->next) {
if (cur->child == NULL) {
continue;
@@ -219,4 +219,3 @@
return 1;
}
-
diff -r 5853c8cfbc2c -r c90d0365acad usr.sbin/makefs/chfs/chfs_mkfs.c
--- a/usr.sbin/makefs/chfs/chfs_mkfs.c Sat Apr 09 09:59:16 2022 +0000
+++ b/usr.sbin/makefs/chfs/chfs_mkfs.c Sat Apr 09 10:05:35 2022 +0000
@@ -153,7 +153,7 @@
CHFS_EB_HDR_NOR_SIZE - 4));
memcpy(buf, &ebhdr.u.nor_hdr, CHFS_EB_HDR_NOR_SIZE);
}
-
+
buf_write(fsopts, buf, opts->pagesize);
free(buf);
}
@@ -163,7 +163,7 @@
{
struct chfs_flash_vnode fvnode;
memset(&fvnode, 0, sizeof(fvnode));
-
+
fvnode.magic = htole16(CHFS_FS_MAGIC_BITMASK);
fvnode.type = htole16(CHFS_NODETYPE_VNODE);
fvnode.length = htole32(CHFS_PAD(sizeof(fvnode)));
@@ -215,7 +215,7 @@
fdirent.name_crc = htole32(crc32(0, (uint8_t *)name, fdirent.nsize));
fdirent.node_crc = htole32(crc32(0, (uint8_t *)&fdirent,
sizeof(fdirent) - 4));
-
+
pad_block_if_less_than(fsopts, sizeof(fdirent) + fdirent.nsize);
buf_write(fsopts, &fdirent, sizeof(fdirent));
buf_write(fsopts, name, fdirent.nsize);
@@ -256,7 +256,7 @@
fileofs += len;
}
free(longname);
- close(fd);
+ close(fd);
} else if (node->type == S_IFLNK) {
len = strlen(node->symlink);
memcpy(buf, node->symlink, len);
@@ -284,7 +284,7 @@
if (len == 0) {
return;
}
-
+
pad_block_if_less_than(fsopts, sizeof(fdata) + len);
fdata.magic = htole16(CHFS_FS_MAGIC_BITMASK);
diff -r 5853c8cfbc2c -r c90d0365acad usr.sbin/makefs/ffs.c
--- a/usr.sbin/makefs/ffs.c Sat Apr 09 09:59:16 2022 +0000
+++ b/usr.sbin/makefs/ffs.c Sat Apr 09 10:05:35 2022 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs.c,v 1.71 2022/04/06 13:44:25 wiz Exp $ */
+/* $NetBSD: ffs.c,v 1.72 2022/04/09 10:05:35 riastradh Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -71,7 +71,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: ffs.c,v 1.71 2022/04/06 13:44:25 wiz Exp $");
+__RCSID("$NetBSD: ffs.c,v 1.72 2022/04/09 10:05:35 riastradh Exp $");
#endif /* !__lint */
#include <sys/param.h>
@@ -387,11 +387,11 @@
/* add space needed to store inodes, x3 for blockmaps, etc */
if (ffs_opts->version == 1)
fsopts->size += ncg * DINODE1_SIZE *
- roundup(fsopts->inodes / ncg,
+ roundup(fsopts->inodes / ncg,
ffs_opts->bsize / DINODE1_SIZE);
else
fsopts->size += ncg * DINODE2_SIZE *
- roundup(fsopts->inodes / ncg,
+ roundup(fsopts->inodes / ncg,
ffs_opts->bsize / DINODE2_SIZE);
/* add minfree */
@@ -966,7 +966,7 @@
if (!isfile)
p += chunk;
}
-
+
write_inode_and_leave:
ffs_write_inode(&in.i_din, in.i_number, fsopts);
@@ -1108,7 +1108,7 @@
if (S_ISDIR(DIP(dp, mode))) {
ufs_add32(cgp->cg_cs.cs_ndir, 1, fsopts->needswap);
fs->fs_cstotal.cs_ndir++;
- fs->fs_cs(fs, cg).cs_ndir++;
+ fs->fs_cs(fs, cg).cs_ndir++;
}
/*
diff -r 5853c8cfbc2c -r c90d0365acad usr.sbin/makefs/ffs/buf.c
--- a/usr.sbin/makefs/ffs/buf.c Sat Apr 09 09:59:16 2022 +0000
+++ b/usr.sbin/makefs/ffs/buf.c Sat Apr 09 10:05:35 2022 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: buf.c,v 1.24 2016/06/24 19:24:11 christos Exp $ */
+/* $NetBSD: buf.c,v 1.25 2022/04/09 10:05:35 riastradh Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -41,7 +41,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: buf.c,v 1.24 2016/06/24 19:24:11 christos Exp $");
+__RCSID("$NetBSD: buf.c,v 1.25 2022/04/09 10:05:35 riastradh Exp $");
#endif /* !__lint */
#include <sys/param.h>
@@ -118,7 +118,7 @@
bp->b_bcount = 0;
return;
}
-
+
TAILQ_REMOVE(&buftail, bp, b_tailq);
free(bp->b_data);
free(bp);
@@ -163,7 +163,7 @@
* know why there's still some buffers lying around that
* aren't brelse()d
*/
-
+
if (TAILQ_EMPTY(&buftail))
return;
diff -r 5853c8cfbc2c -r c90d0365acad usr.sbin/makefs/ffs/ffs_alloc.c
--- a/usr.sbin/makefs/ffs/ffs_alloc.c Sat Apr 09 09:59:16 2022 +0000
+++ b/usr.sbin/makefs/ffs/ffs_alloc.c Sat Apr 09 10:05:35 2022 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs_alloc.c,v 1.29 2016/06/24 19:24:11 christos Exp $ */
+/* $NetBSD: ffs_alloc.c,v 1.30 2022/04/09 10:05:35 riastradh Exp $ */
/* From: NetBSD: ffs_alloc.c,v 1.50 2001/09/06 02:16:01 lukem Exp */
/*
Home |
Main Index |
Thread Index |
Old Index