From 8e544e80ad051c7ebb0293f80569ecb775fbd3bf Mon Sep 17 00:00:00 2001 From: jsg Date: Tue, 11 Jan 2022 05:34:32 +0000 Subject: [PATCH] spelling --- usr.sbin/makefs/README | 6 +++--- usr.sbin/makefs/cd9660.c | 6 +++--- usr.sbin/makefs/cd9660/cd9660_write.c | 6 +++--- usr.sbin/makefs/ffs.c | 4 ++-- usr.sbin/makefs/ffs/ffs_alloc.c | 8 ++++---- usr.sbin/makefs/ffs/ffs_subr.c | 4 ++-- usr.sbin/makefs/msdos/msdosfs_fat.c | 8 ++++---- usr.sbin/makefs/walk.c | 4 ++-- 8 files changed, 23 insertions(+), 23 deletions(-) diff --git a/usr.sbin/makefs/README b/usr.sbin/makefs/README index 947d6f7cff7..4219fbba981 100644 --- a/usr.sbin/makefs/README +++ b/usr.sbin/makefs/README @@ -1,4 +1,4 @@ -$OpenBSD: README,v 1.3 2016/12/17 16:12:15 krw Exp $ +$OpenBSD: README,v 1.4 2022/01/11 05:34:32 jsg Exp $ $NetBSD: README,v 1.7 2015/01/12 19:50:47 christos Exp $ makefs - build a file system image from a directory tree @@ -21,7 +21,7 @@ the following file system types can be built: ffs BSD fast file system msdos MS-DOS `FAT' file system (FAT12, FAT16, FAT32) -Various file system independent parameters and contraints can be +Various file system independent parameters and constraints can be specified, such as: - minimum file system size (in KB) @@ -92,7 +92,7 @@ Each fs-specific module should have the following external interfaces: prepare_options and cleanup_options are optional and can be NULL. NOTE: All file system specific options are referenced via the fs_specific -pointer from the fsinfo_t strucutre. It is up to the filesystem to allocate +pointer from the fsinfo_t structure. It is up to the filesystem to allocate and free any data needed for this via the prepare and cleanup callbacks. Each fs-specific module will need to add its routines to the dispatch array diff --git a/usr.sbin/makefs/cd9660.c b/usr.sbin/makefs/cd9660.c index 62e0a159992..9fbcc5d0dbc 100644 --- a/usr.sbin/makefs/cd9660.c +++ b/usr.sbin/makefs/cd9660.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cd9660.c,v 1.22 2021/07/12 15:09:21 beck Exp $ */ +/* $OpenBSD: cd9660.c,v 1.23 2022/01/11 05:34:32 jsg Exp $ */ /* $NetBSD: cd9660.c,v 1.53 2016/11/25 23:02:44 christos Exp $ */ /* @@ -164,7 +164,7 @@ static int cd9660_add_generic_bootimage(iso9660_disk *, const char *); /* - * Allocate and initalize a cd9660node + * Allocate and initialize a cd9660node * @returns struct cd9660node * Pointer to new node, or NULL on error */ static cd9660node * @@ -872,7 +872,7 @@ cd9660_sorted_child_insert(cd9660node *parent, cd9660node *cn_new) /* * Called After cd9660_sorted_child_insert - * handles file collisions by suffixing each filname with ~n + * handles file collisions by suffixing each filename with ~n * where n represents the files respective place in the ordering */ static int diff --git a/usr.sbin/makefs/cd9660/cd9660_write.c b/usr.sbin/makefs/cd9660/cd9660_write.c index 9bb3e383bb6..2110712bb64 100644 --- a/usr.sbin/makefs/cd9660/cd9660_write.c +++ b/usr.sbin/makefs/cd9660/cd9660_write.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cd9660_write.c,v 1.8 2017/04/06 19:09:45 natano Exp $ */ +/* $OpenBSD: cd9660_write.c,v 1.9 2022/01/11 05:34:33 jsg Exp $ */ /* $NetBSD: cd9660_write.c,v 1.17 2013/10/19 17:16:37 christos Exp $ */ /* @@ -83,7 +83,7 @@ cd9660_write_image(iso9660_disk *diskStructure, const char* image) /* * Write the path tables: there are actually four, but right - * now we are only concearned with two. + * now we are only concerned with two. */ status = cd9660_write_path_tables(diskStructure, fd); if (status == 0) { @@ -265,7 +265,7 @@ cd9660_write_file(iso9660_disk *diskStructure, FILE *fd, cd9660node *writenode) * Here is a new revelation that ECMA didnt explain * (at least not well). * ALL . and .. records store the name "\0" and "\1" - * resepctively. So, for each directory, we have to + * respectively. So, for each directory, we have to * make a new node. * * This is where it gets kinda messy, since we have to diff --git a/usr.sbin/makefs/ffs.c b/usr.sbin/makefs/ffs.c index a11ea3e660e..6c027df21a9 100644 --- a/usr.sbin/makefs/ffs.c +++ b/usr.sbin/makefs/ffs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ffs.c,v 1.35 2021/10/24 21:24:19 deraadt Exp $ */ +/* $OpenBSD: ffs.c,v 1.36 2022/01/11 05:34:32 jsg Exp $ */ /* $NetBSD: ffs.c,v 1.66 2015/12/21 00:58:08 christos Exp $ */ /* @@ -126,7 +126,7 @@ static void *ffs_build_dinode2(struct ufs2_dinode *, dirbuf_t *, fsnode *, - /* publically visible functions */ + /* publicly visible functions */ void ffs_prep_opts(fsinfo_t *fsopts) { diff --git a/usr.sbin/makefs/ffs/ffs_alloc.c b/usr.sbin/makefs/ffs/ffs_alloc.c index 5873c40aad7..b213d899667 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.14 2021/10/06 00:40:41 deraadt Exp $ */ +/* $OpenBSD: ffs_alloc.c,v 1.15 2022/01/11 05:34:33 jsg 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 */ @@ -72,13 +72,13 @@ static int32_t ffs_mapsearch(struct fs *, struct cg *, daddr_t, int); * 1) allocate the requested block. * 2) allocate a rotationally optimal block in the same cylinder. * 3) allocate a block in the same cylinder group. - * 4) quadradically rehash into other cylinder groups, until an + * 4) quadratically rehash into other cylinder groups, until an * available block is located. * If no block preference is given the following hierarchy is used * to allocate a block: * 1) allocate a block in the cylinder group that contains the * inode for the file. - * 2) quadradically rehash into other cylinder groups, until an + * 2) quadratically rehash into other cylinder groups, until an * available block is located. */ int @@ -222,7 +222,7 @@ ffs_blkpref_ufs2(struct inode *ip, daddr_t lbn, int indx, int64_t *bap) * * The policy implemented by this algorithm is: * 1) allocate the block in its requested cylinder group. - * 2) quadradically rehash on the cylinder group number. + * 2) quadratically rehash on the cylinder group number. * 3) brute force search for a free block. * * `size': size for data blocks, mode for inodes diff --git a/usr.sbin/makefs/ffs/ffs_subr.c b/usr.sbin/makefs/ffs/ffs_subr.c index 18c9e621193..8d8d528d52e 100644 --- a/usr.sbin/makefs/ffs/ffs_subr.c +++ b/usr.sbin/makefs/ffs/ffs_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ffs_subr.c,v 1.5 2021/10/06 00:40:41 deraadt Exp $ */ +/* $OpenBSD: ffs_subr.c,v 1.6 2022/01/11 05:34:33 jsg Exp $ */ /* $NetBSD: ffs_subr.c,v 1.49 2016/05/07 11:59:08 maxv Exp $ */ /* @@ -47,7 +47,7 @@ * block operations * * check if a block is available - * returns true if all the correponding bits in the free map are 1 + * returns true if all the corresponding bits in the free map are 1 * returns false if any corresponding bit in the free map is 0 */ int diff --git a/usr.sbin/makefs/msdos/msdosfs_fat.c b/usr.sbin/makefs/msdos/msdosfs_fat.c index 336c5f68560..bcf2cc84535 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.6 2021/10/06 00:40:41 deraadt Exp $ */ +/* $OpenBSD: msdosfs_fat.c,v 1.7 2022/01/11 05:34:33 jsg Exp $ */ /* $NetBSD: msdosfs_fat.c,v 1.31 2016/05/07 16:43:02 mlelstv Exp $ */ /*- @@ -148,7 +148,7 @@ pcbmap(struct denode *dep, u_long findcn, daddr_t *bnp, u_long *cnp, int *sp) int error; u_long i; u_long cn; - u_long prevcn = 0; /* XXX: prevcn could be used unititialized */ + u_long prevcn = 0; /* XXX: prevcn could be used uninitialized */ u_long byteoffset; u_long bn; u_long bo; @@ -722,7 +722,7 @@ chainlength(struct msdosfsmount *pmp, u_long start, u_long count) } /* - * Allocate contigous free clusters. + * Allocate contiguous free clusters. * * pmp - mount point. * start - start of cluster chain. @@ -768,7 +768,7 @@ clusteralloc(struct msdosfsmount *pmp, u_long start, u_long count, u_long *retcl { u_long idx; u_long len, newst, foundl, cn, l; - u_long foundcn = 0; /* XXX: foundcn could be used unititialized */ + u_long foundcn = 0; /* XXX: foundcn could be used uninitialized */ u_long fillwith = CLUST_EOFE; u_int map; diff --git a/usr.sbin/makefs/walk.c b/usr.sbin/makefs/walk.c index d9bc8062006..1270f1af628 100644 --- a/usr.sbin/makefs/walk.c +++ b/usr.sbin/makefs/walk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: walk.c,v 1.10 2021/09/01 15:19:00 deraadt Exp $ */ +/* $OpenBSD: walk.c,v 1.11 2022/01/11 05:34:32 jsg Exp $ */ /* $NetBSD: walk.c,v 1.29 2015/11/25 00:48:49 christos Exp $ */ /* @@ -218,7 +218,7 @@ create_fsnode(const char *root, const char *path, const char *name, /* * free_fsnodes -- * Removes node from tree and frees it and all of - * its decendents. + * its descendants. */ void free_fsnodes(fsnode *node) -- 2.20.1