Module Name: src Committed By: riastradh Date: Sat Apr 9 10:05:35 UTC 2022
Modified Files: src/usr.sbin/makefs: chfs.c ffs.c makefs.c makefs.h msdos.c udf.c walk.c src/usr.sbin/makefs/cd9660: cd9660_archimedes.c cd9660_archimedes.h cd9660_eltorito.c src/usr.sbin/makefs/chfs: chfs_mkfs.c src/usr.sbin/makefs/ffs: buf.c ffs_alloc.c ffs_extern.h ufs_bmap.c src/usr.sbin/makefs/msdos: msdosfs_vfsops.c msdosfs_vnops.c src/usr.sbin/makefs/udf: cdio_mmc_structs.h Log Message: makefs(8): Nix trailing whitespace. Computed by machine, eyeballed by hand, so to speak. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/makefs/chfs.c cvs rdiff -u -r1.71 -r1.72 src/usr.sbin/makefs/ffs.c cvs rdiff -u -r1.54 -r1.55 src/usr.sbin/makefs/makefs.c cvs rdiff -u -r1.37 -r1.38 src/usr.sbin/makefs/makefs.h cvs rdiff -u -r1.20 -r1.21 src/usr.sbin/makefs/msdos.c cvs rdiff -u -r1.24 -r1.25 src/usr.sbin/makefs/udf.c cvs rdiff -u -r1.31 -r1.32 src/usr.sbin/makefs/walk.c cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/makefs/cd9660/cd9660_archimedes.c cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/makefs/cd9660/cd9660_archimedes.h cvs rdiff -u -r1.24 -r1.25 src/usr.sbin/makefs/cd9660/cd9660_eltorito.c cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/makefs/chfs/chfs_mkfs.c cvs rdiff -u -r1.24 -r1.25 src/usr.sbin/makefs/ffs/buf.c cvs rdiff -u -r1.29 -r1.30 src/usr.sbin/makefs/ffs/ffs_alloc.c cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/makefs/ffs/ffs_extern.h cvs rdiff -u -r1.18 -r1.19 src/usr.sbin/makefs/ffs/ufs_bmap.c cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/makefs/msdos/msdosfs_vfsops.c cvs rdiff -u -r1.21 -r1.22 src/usr.sbin/makefs/msdos/msdosfs_vnops.c cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/makefs/udf/cdio_mmc_structs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/usr.sbin/makefs/chfs.c diff -u src/usr.sbin/makefs/chfs.c:1.8 src/usr.sbin/makefs/chfs.c:1.9 --- src/usr.sbin/makefs/chfs.c:1.8 Tue Jan 29 15:52:25 2013 +++ src/usr.sbin/makefs/chfs.c Sat Apr 9 10:05:35 2022 @@ -102,7 +102,7 @@ chfs_makefs(const char *image, const cha 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 @@ chfs_makefs(const char *image, const cha 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 @@ chfs_create_image(const char *image, fsi { 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 @@ chfs_populate_dir(const char *dir, fsnod 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 @@ chfs_populate_dir(const char *dir, fsnod write_file(fsopts, cur, dir); } } - + for (cur = root; cur != NULL; cur = cur->next) { if (cur->child == NULL) { continue; @@ -219,4 +219,3 @@ chfs_populate_dir(const char *dir, fsnod return 1; } - Index: src/usr.sbin/makefs/ffs.c diff -u src/usr.sbin/makefs/ffs.c:1.71 src/usr.sbin/makefs/ffs.c:1.72 --- src/usr.sbin/makefs/ffs.c:1.71 Wed Apr 6 13:44:25 2022 +++ src/usr.sbin/makefs/ffs.c Sat Apr 9 10:05:35 2022 @@ -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 @@ ffs_validate(const char *dir, fsnode *ro /* 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 @@ ffs_write_file(union dinode *din, uint32 if (!isfile) p += chunk; } - + write_inode_and_leave: ffs_write_inode(&in.i_din, in.i_number, fsopts); @@ -1108,7 +1108,7 @@ ffs_write_inode(union dinode *dp, uint32 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++; } /* Index: src/usr.sbin/makefs/makefs.c diff -u src/usr.sbin/makefs/makefs.c:1.54 src/usr.sbin/makefs/makefs.c:1.55 --- src/usr.sbin/makefs/makefs.c:1.54 Sat Apr 3 14:10:56 2021 +++ src/usr.sbin/makefs/makefs.c Sat Apr 9 10:05:35 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: makefs.c,v 1.54 2021/04/03 14:10:56 simonb Exp $ */ +/* $NetBSD: makefs.c,v 1.55 2022/04/09 10:05:35 riastradh Exp $ */ /* * Copyright (c) 2001-2003 Wasabi Systems, Inc. @@ -41,7 +41,7 @@ #include <sys/cdefs.h> #if defined(__RCSID) && !defined(__lint) -__RCSID("$NetBSD: makefs.c,v 1.54 2021/04/03 14:10:56 simonb Exp $"); +__RCSID("$NetBSD: makefs.c,v 1.55 2022/04/09 10:05:35 riastradh Exp $"); #endif /* !__lint */ #include <assert.h> @@ -209,10 +209,10 @@ main(int argc, char *argv[]) break; case 'O': - fsoptions.offset = + fsoptions.offset = strsuftoll("offset", optarg, 0LL, LLONG_MAX); break; - + case 'o': { char *p; @@ -411,7 +411,7 @@ static fstype_t * get_fstype(const char *type) { int i; - + for (i = 0; fstypes[i].type != NULL; i++) if (strcmp(fstypes[i].type, type) == 0) return (&fstypes[i]); @@ -451,7 +451,7 @@ get_tstamp(const char *b, struct stat *s } st->st_ino = 1; -#if HAVE_STRUCT_STAT_BIRTHTIME +#if HAVE_STRUCT_STAT_BIRTHTIME st->st_birthtime = #endif st->st_mtime = st->st_ctime = st->st_atime = when; Index: src/usr.sbin/makefs/makefs.h diff -u src/usr.sbin/makefs/makefs.h:1.37 src/usr.sbin/makefs/makefs.h:1.38 --- src/usr.sbin/makefs/makefs.h:1.37 Sat Apr 3 14:10:56 2021 +++ src/usr.sbin/makefs/makefs.h Sat Apr 9 10:05:35 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: makefs.h,v 1.37 2021/04/03 14:10:56 simonb Exp $ */ +/* $NetBSD: makefs.h,v 1.38 2022/04/09 10:05:35 riastradh Exp $ */ /* * Copyright (c) 2001 Wasabi Systems, Inc. @@ -57,7 +57,7 @@ * a component of the tree; contains a filename, a pointer to * fsinode, optional symlink name, and tree pointers * - * fsinode - + * fsinode - * equivalent to an inode, containing target file system inode number, * refcount (nlink), and stat buffer * Index: src/usr.sbin/makefs/msdos.c diff -u src/usr.sbin/makefs/msdos.c:1.20 src/usr.sbin/makefs/msdos.c:1.21 --- src/usr.sbin/makefs/msdos.c:1.20 Fri Apr 14 15:40:35 2017 +++ src/usr.sbin/makefs/msdos.c Sat Apr 9 10:05:35 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: msdos.c,v 1.20 2017/04/14 15:40:35 christos Exp $ */ +/* $NetBSD: msdos.c,v 1.21 2022/04/09 10:05:35 riastradh Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ #include <sys/cdefs.h> #if defined(__RCSID) && !defined(__lint) -__RCSID("$NetBSD: msdos.c,v 1.20 2017/04/14 15:40:35 christos Exp $"); +__RCSID("$NetBSD: msdos.c,v 1.21 2022/04/09 10:05:35 riastradh Exp $"); #endif /* !__lint */ #include <sys/param.h> @@ -91,7 +91,7 @@ msdos_prep_opts(fsinfo_t *fsopts) .desc = _desc, \ }, ALLOPTS -#undef AOPT +#undef AOPT { 'U', "utf8", &msdos_opt->utf8, OPT_BOOL, 0, 1, "Use UTF8 names" }, { .name = NULL } @@ -169,7 +169,7 @@ msdos_makefs(const char *image, const ch fsopts->sectorsize = msdos_opt->options.bytes_per_sector; } else if (fsopts->sectorsize != msdos_opt->options.bytes_per_sector) { err(1, "inconsistent sectorsize -S %u" - "!= -o bytes_per_sector %u", + "!= -o bytes_per_sector %u", fsopts->sectorsize, msdos_opt->options.bytes_per_sector); } @@ -223,8 +223,8 @@ msdos_populate_dir(const char *path, str assert(dir != NULL); assert(root != NULL); - assert(fsopts != NULL); - + assert(fsopts != NULL); + for (cur = root->next; cur != NULL; cur = cur->next) { if ((size_t)snprintf(pbuf, sizeof(pbuf), "%s/%s", path, cur->name) >= sizeof(pbuf)) { Index: src/usr.sbin/makefs/udf.c diff -u src/usr.sbin/makefs/udf.c:1.24 src/usr.sbin/makefs/udf.c:1.25 --- src/usr.sbin/makefs/udf.c:1.24 Wed Apr 6 13:44:25 2022 +++ src/usr.sbin/makefs/udf.c Sat Apr 9 10:05:35 2022 @@ -1,9 +1,9 @@ -/* $NetBSD: udf.c,v 1.24 2022/04/06 13:44:25 wiz Exp $ */ +/* $NetBSD: udf.c,v 1.25 2022/04/09 10:05:35 riastradh Exp $ */ /* * Copyright (c) 2006, 2008, 2013, 2021, 2022 Reinoud Zandijk * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -12,7 +12,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * 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. @@ -23,14 +23,14 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * + * */ #if HAVE_NBTOOL_CONFIG_H #include "nbtool_config.h" #endif #include <sys/cdefs.h> -__RCSID("$NetBSD: udf.c,v 1.24 2022/04/06 13:44:25 wiz Exp $"); +__RCSID("$NetBSD: udf.c,v 1.25 2022/04/09 10:05:35 riastradh Exp $"); #include <stdio.h> #include <stdlib.h> @@ -1258,10 +1258,9 @@ udf_makefs(const char *image, const char } udf_closedisc(); - if (error == 2) + if (error == 2) errx(error, "not all files could be added"); if (error == 1) errx(error, "creation of %s failed", image); return; } - Index: src/usr.sbin/makefs/walk.c diff -u src/usr.sbin/makefs/walk.c:1.31 src/usr.sbin/makefs/walk.c:1.32 --- src/usr.sbin/makefs/walk.c:1.31 Wed Apr 6 13:44:25 2022 +++ src/usr.sbin/makefs/walk.c Sat Apr 9 10:05:35 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: walk.c,v 1.31 2022/04/06 13:44:25 wiz Exp $ */ +/* $NetBSD: walk.c,v 1.32 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: walk.c,v 1.31 2022/04/06 13:44:25 wiz Exp $"); +__RCSID("$NetBSD: walk.c,v 1.32 2022/04/09 10:05:35 riastradh Exp $"); #endif /* !__lint */ #include <sys/param.h> @@ -266,7 +266,7 @@ create_fsnode(const char *root, const ch cur->inode->st.st_mtimensec = stampst.st_mtimensec; cur->inode->st.st_ctimensec = stampst.st_ctimensec; #endif -#if HAVE_STRUCT_STAT_BIRTHTIME +#if HAVE_STRUCT_STAT_BIRTHTIME cur->inode->st.st_birthtime = stampst.st_birthtime; cur->inode->st.st_birthtimensec = stampst.st_birthtimensec; #endif @@ -639,7 +639,7 @@ inode_type(mode_t mode) * return pointer to fsinode matching `entry's st_ino & st_dev if it exists, * otherwise add `entry' to table and return NULL */ -/* This was borrowed from du.c and tweaked to keep an fsnode +/* This was borrowed from du.c and tweaked to keep an fsnode * pointer instead. -- d...@netbsd.org */ static fsinode * @@ -658,7 +658,7 @@ link_check(fsinode *entry) */ const uint64_t HTCONST = 11400714819323198485ULL; const int HTBITS = 64; - + /* Never store zero in hashtable */ assert(entry); @@ -693,7 +693,7 @@ link_check(fsinode *entry) tmp *= HTCONST; h = tmp >> (HTBITS - htshift); h2 = 1 | ( tmp >> (HTBITS - (htshift<<1) - 1)); /* must be odd */ - + /* open address hashtable search with double hash probing */ while (htable[h].data) { if ((htable[h].data->st.st_ino == entry->st.st_ino) && Index: src/usr.sbin/makefs/cd9660/cd9660_archimedes.c diff -u src/usr.sbin/makefs/cd9660/cd9660_archimedes.c:1.2 src/usr.sbin/makefs/cd9660/cd9660_archimedes.c:1.3 --- src/usr.sbin/makefs/cd9660/cd9660_archimedes.c:1.2 Mon Jan 28 21:03:28 2013 +++ src/usr.sbin/makefs/cd9660/cd9660_archimedes.c Sat Apr 9 10:05:35 2022 @@ -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> Index: src/usr.sbin/makefs/cd9660/cd9660_archimedes.h diff -u src/usr.sbin/makefs/cd9660/cd9660_archimedes.h:1.1 src/usr.sbin/makefs/cd9660/cd9660_archimedes.h:1.2 --- src/usr.sbin/makefs/cd9660/cd9660_archimedes.h:1.1 Sat Jan 10 22:06:29 2009 +++ src/usr.sbin/makefs/cd9660/cd9660_archimedes.h Sat Apr 9 10:05:35 2022 @@ -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. Index: src/usr.sbin/makefs/cd9660/cd9660_eltorito.c diff -u src/usr.sbin/makefs/cd9660/cd9660_eltorito.c:1.24 src/usr.sbin/makefs/cd9660/cd9660_eltorito.c:1.25 --- src/usr.sbin/makefs/cd9660/cd9660_eltorito.c:1.24 Sun Nov 15 00:18:48 2020 +++ src/usr.sbin/makefs/cd9660/cd9660_eltorito.c Sat Apr 9 10:05:35 2022 @@ -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 @@ cd9660_setup_boot(iso9660_disk *diskStru * 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 @@ cd9660_write_mbr_partition_entry(FILE *f 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 @@ cd9660_write_apm_partition_entry(FILE *f 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_write_boot(iso9660_disk *diskStru } 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++; } Index: src/usr.sbin/makefs/chfs/chfs_mkfs.c diff -u src/usr.sbin/makefs/chfs/chfs_mkfs.c:1.8 src/usr.sbin/makefs/chfs/chfs_mkfs.c:1.9 --- src/usr.sbin/makefs/chfs/chfs_mkfs.c:1.8 Tue Jan 10 04:27:02 2017 +++ src/usr.sbin/makefs/chfs/chfs_mkfs.c Sat Apr 9 10:05:35 2022 @@ -153,7 +153,7 @@ write_eb_header(fsinfo_t *fsopts) 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 @@ write_vnode(fsinfo_t *fsopts, fsnode *no { 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 @@ write_dirent(fsinfo_t *fsopts, fsnode *n 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 @@ write_file(fsinfo_t *fsopts, fsnode *nod 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 @@ write_data(fsinfo_t *fsopts, fsnode *nod if (len == 0) { return; } - + pad_block_if_less_than(fsopts, sizeof(fdata) + len); fdata.magic = htole16(CHFS_FS_MAGIC_BITMASK); Index: src/usr.sbin/makefs/ffs/buf.c diff -u src/usr.sbin/makefs/ffs/buf.c:1.24 src/usr.sbin/makefs/ffs/buf.c:1.25 --- src/usr.sbin/makefs/ffs/buf.c:1.24 Fri Jun 24 19:24:11 2016 +++ src/usr.sbin/makefs/ffs/buf.c Sat Apr 9 10:05:35 2022 @@ -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 @@ brelse(struct buf *bp, int u1 __unused) bp->b_bcount = 0; return; } - + TAILQ_REMOVE(&buftail, bp, b_tailq); free(bp->b_data); free(bp); @@ -163,7 +163,7 @@ bcleanup(void) * know why there's still some buffers lying around that * aren't brelse()d */ - + if (TAILQ_EMPTY(&buftail)) return; Index: src/usr.sbin/makefs/ffs/ffs_alloc.c diff -u src/usr.sbin/makefs/ffs/ffs_alloc.c:1.29 src/usr.sbin/makefs/ffs/ffs_alloc.c:1.30 --- src/usr.sbin/makefs/ffs/ffs_alloc.c:1.29 Fri Jun 24 19:24:11 2016 +++ src/usr.sbin/makefs/ffs/ffs_alloc.c Sat Apr 9 10:05:35 2022 @@ -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 */ /* @@ -47,7 +47,7 @@ #include <sys/cdefs.h> #if defined(__RCSID) && !defined(__lint) -__RCSID("$NetBSD: ffs_alloc.c,v 1.29 2016/06/24 19:24:11 christos Exp $"); +__RCSID("$NetBSD: ffs_alloc.c,v 1.30 2022/04/09 10:05:35 riastradh Exp $"); #endif /* !__lint */ #include <sys/param.h> @@ -80,7 +80,7 @@ extern const u_char * const fragtbl[]; /* * 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 @@ -104,7 +104,7 @@ ffs_alloc(struct inode *ip, daddr_t lbn struct fs *fs = ip->i_fs; daddr_t bno; int cg; - + *bnp = 0; if (size > fs->fs_bsize || ffs_fragoff(fs, size) != 0) { errx(EXIT_FAILURE, "%s: bad size: bsize %d size %d", __func__, @@ -132,7 +132,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 @@ -146,7 +146,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 @@ -334,7 +334,7 @@ ffs_alloccg(struct inode *ip, int cg, da 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) { @@ -426,7 +426,7 @@ gotit: * Free a block or fragment. * * The specified block or fragment is placed back in the - * free map. If a fragment is deallocated, a possible + * free map. If a fragment is deallocated, a possible * block reassembly is checked. */ void Index: src/usr.sbin/makefs/ffs/ffs_extern.h diff -u src/usr.sbin/makefs/ffs/ffs_extern.h:1.7 src/usr.sbin/makefs/ffs/ffs_extern.h:1.8 --- src/usr.sbin/makefs/ffs/ffs_extern.h:1.7 Thu Feb 9 04:42:53 2017 +++ src/usr.sbin/makefs/ffs/ffs_extern.h Sat Apr 9 10:05:35 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: ffs_extern.h,v 1.7 2017/02/09 04:42:53 kre Exp $ */ +/* $NetBSD: ffs_extern.h,v 1.8 2022/04/09 10:05:35 riastradh Exp $ */ /* From: NetBSD: ffs_extern.h,v 1.19 2001/08/17 02:18:48 lukem Exp */ /*- @@ -46,7 +46,7 @@ struct indir { /* ffs.c */ void panic(const char *, ...) - __attribute__((__noreturn__,__format__(__printf__,1,2))); + __attribute__((__noreturn__,__format__(__printf__,1,2))); /* ffs_alloc.c */ int ffs_alloc(struct inode *, daddr_t, daddr_t, int, daddr_t *); Index: src/usr.sbin/makefs/ffs/ufs_bmap.c diff -u src/usr.sbin/makefs/ffs/ufs_bmap.c:1.18 src/usr.sbin/makefs/ffs/ufs_bmap.c:1.19 --- src/usr.sbin/makefs/ffs/ufs_bmap.c:1.18 Wed Jun 19 17:51:27 2013 +++ src/usr.sbin/makefs/ffs/ufs_bmap.c Sat Apr 9 10:05:35 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: ufs_bmap.c,v 1.18 2013/06/19 17:51:27 dholland Exp $ */ +/* $NetBSD: ufs_bmap.c,v 1.19 2022/04/09 10:05:35 riastradh Exp $ */ /* From: NetBSD: ufs_bmap.c,v 1.14 2001/11/08 05:00:51 chs Exp */ /* @@ -43,7 +43,7 @@ #include <sys/cdefs.h> #if defined(__RCSID) && !defined(__lint) -__RCSID("$NetBSD: ufs_bmap.c,v 1.18 2013/06/19 17:51:27 dholland Exp $"); +__RCSID("$NetBSD: ufs_bmap.c,v 1.19 2022/04/09 10:05:35 riastradh Exp $"); #endif /* !__lint */ #include <sys/param.h> @@ -90,7 +90,7 @@ ufs_getlbns(struct inode *ip, daddr_t bn assert (bn >= UFS_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 UFS_NIADDR - i is the number @@ -112,7 +112,7 @@ ufs_getlbns(struct inode *ip, daddr_t bn /* Calculate the address of the first meta-block. */ metalbn = -((realbn >= 0 ? realbn : -realbn) - bn + UFS_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 Index: src/usr.sbin/makefs/msdos/msdosfs_vfsops.c diff -u src/usr.sbin/makefs/msdos/msdosfs_vfsops.c:1.12 src/usr.sbin/makefs/msdos/msdosfs_vfsops.c:1.13 --- src/usr.sbin/makefs/msdos/msdosfs_vfsops.c:1.12 Sat Oct 23 16:58:17 2021 +++ src/usr.sbin/makefs/msdos/msdosfs_vfsops.c Sat Apr 9 10:05:35 2022 @@ -50,7 +50,7 @@ #endif #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: msdosfs_vfsops.c,v 1.12 2021/10/23 16:58:17 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: msdosfs_vfsops.c,v 1.13 2022/04/09 10:05:35 riastradh Exp $"); #include <sys/param.h> @@ -108,7 +108,7 @@ msdosfs_mount(struct vnode *devvp, int f if (!(flags & MSDOSFSMNT_GEMDOSFS)) { 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; @@ -145,7 +145,7 @@ msdosfs_mount(struct vnode *devvp, int f 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; @@ -317,7 +317,7 @@ msdosfs_mount(struct vnode *devvp, int f * 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; Index: src/usr.sbin/makefs/msdos/msdosfs_vnops.c diff -u src/usr.sbin/makefs/msdos/msdosfs_vnops.c:1.21 src/usr.sbin/makefs/msdos/msdosfs_vnops.c:1.22 --- src/usr.sbin/makefs/msdos/msdosfs_vnops.c:1.21 Sat Oct 23 16:58:17 2021 +++ src/usr.sbin/makefs/msdos/msdosfs_vnops.c Sat Apr 9 10:05:35 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: msdosfs_vnops.c,v 1.21 2021/10/23 16:58:17 thorpej Exp $ */ +/* $NetBSD: msdosfs_vnops.c,v 1.22 2022/04/09 10:05:35 riastradh Exp $ */ /*- * Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank. @@ -51,7 +51,7 @@ #endif #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: msdosfs_vnops.c,v 1.21 2021/10/23 16:58:17 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: msdosfs_vnops.c,v 1.22 2022/04/09 10:05:35 riastradh Exp $"); #include <sys/param.h> #include <sys/mman.h> @@ -101,7 +101,7 @@ msdosfs_times(struct msdosfsmount *pmp, struct timespec at; struct timespec mt; - if (stampst.st_ino) + if (stampst.st_ino) st = &stampst; #ifndef HAVE_NBTOOL_CONFIG_H @@ -135,7 +135,7 @@ msdosfs_times(struct msdosfsmount *pmp, * 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; @@ -500,7 +500,7 @@ msdosfs_wfile(const char *path, struct d 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); Index: src/usr.sbin/makefs/udf/cdio_mmc_structs.h diff -u src/usr.sbin/makefs/udf/cdio_mmc_structs.h:1.1 src/usr.sbin/makefs/udf/cdio_mmc_structs.h:1.2 --- src/usr.sbin/makefs/udf/cdio_mmc_structs.h:1.1 Mon Aug 5 18:44:16 2013 +++ src/usr.sbin/makefs/udf/cdio_mmc_structs.h Sat Apr 9 10:05:35 2022 @@ -1,9 +1,9 @@ -/* $NetBSD: cdio_mmc_structs.h,v 1.1 2013/08/05 18:44:16 reinoud Exp $ */ +/* $NetBSD: cdio_mmc_structs.h,v 1.2 2022/04/09 10:05:35 riastradh Exp $ */ /* * Copyright (c) 2006, 2008, 2013 Reinoud Zandijk * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -12,7 +12,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * 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. @@ -23,7 +23,7 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * + * */ #ifndef _CDIO_MMC_EMU_H_