Module Name: src
Committed By: andvar
Date: Wed Oct 26 21:56:19 UTC 2022
Modified Files:
src/sys/dev/spi: spiflash.c
src/usr.sbin/makefs: README
src/usr.sbin/makemandb: makemandb.c
Log Message:
fix various typos in comments and makefs README file.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/spi/spiflash.c
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/makefs/README
cvs rdiff -u -r1.64 -r1.65 src/usr.sbin/makemandb/makemandb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/spi/spiflash.c
diff -u src/sys/dev/spi/spiflash.c:1.26 src/sys/dev/spi/spiflash.c:1.27
--- src/sys/dev/spi/spiflash.c:1.26 Sun May 8 06:38:58 2022
+++ src/sys/dev/spi/spiflash.c Wed Oct 26 21:56:19 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: spiflash.c,v 1.26 2022/05/08 06:38:58 skrll Exp $ */
+/* $NetBSD: spiflash.c,v 1.27 2022/10/26 21:56:19 andvar Exp $ */
/*-
* Copyright (c) 2006 Urbana-Champaign Independent Media Center.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spiflash.c,v 1.26 2022/05/08 06:38:58 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spiflash.c,v 1.27 2022/10/26 21:56:19 andvar Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -258,7 +258,7 @@ spiflash_open(dev_t dev, int flags, int
* There are devices that could be used "in the raw" with a
* NetBSD label, but then you get into devices that have other
* kinds of data on them -- some have VxWorks data, some have
- * RedBoot data, and some have other contraints -- for example
+ * RedBoot data, and some have other constraints -- for example
* some devices might have a portion that is read-only,
* whereas others might have a portion that is read-write.
*
Index: src/usr.sbin/makefs/README
diff -u src/usr.sbin/makefs/README:1.7 src/usr.sbin/makefs/README:1.8
--- src/usr.sbin/makefs/README:1.7 Mon Jan 12 19:50:47 2015
+++ src/usr.sbin/makefs/README Wed Oct 26 21:56:19 2022
@@ -1,4 +1,4 @@
-$NetBSD: README,v 1.7 2015/01/12 19:50:47 christos Exp $
+$NetBSD: README,v 1.8 2022/10/26 21:56:19 andvar Exp $
makefs - build a file system image from a directory tree
@@ -27,7 +27,7 @@ Support for the following file systems m
ext2fs Linux EXT2 file system
-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)
@@ -35,7 +35,7 @@ specified, such as:
- free inodes
- free blocks (in KB)
- mtree(8) specification file containing permissions and ownership
- to use in image, overridding the settings in the directory tree
+ to use in image, overriding the settings in the directory tree
- file containing list of files to specifically exclude or include
- fnmatch(3) pattern of filenames to exclude or include
- endianness of target file system
Index: src/usr.sbin/makemandb/makemandb.c
diff -u src/usr.sbin/makemandb/makemandb.c:1.64 src/usr.sbin/makemandb/makemandb.c:1.65
--- src/usr.sbin/makemandb/makemandb.c:1.64 Sun Sep 11 20:32:37 2022
+++ src/usr.sbin/makemandb/makemandb.c Wed Oct 26 21:56:19 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: makemandb.c,v 1.64 2022/09/11 20:32:37 gutteridge Exp $ */
+/* $NetBSD: makemandb.c,v 1.65 2022/10/26 21:56:19 andvar Exp $ */
/*
* Copyright (c) 2011 Abhinav Upadhyay <er.abhinav.upadh...@gmail.com>
* Copyright (c) 2011 Kristaps Dzonsons <krist...@bsd.lv>
@@ -17,7 +17,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: makemandb.c,v 1.64 2022/09/11 20:32:37 gutteridge Exp $");
+__RCSID("$NetBSD: makemandb.c,v 1.65 2022/10/26 21:56:19 andvar Exp $");
#include <sys/stat.h>
#include <sys/types.h>
@@ -503,9 +503,9 @@ traversedir(const char *parent, const ch
}
/* build_file_cache --
- * This function generates an md5 hash of the file passed as its 2nd parameter
+ * This function generates a md5 hash of the file passed as its 2nd parameter
* and stores it in a temporary table file_cache along with the full file path.
- * This is done to support incremental updation of the database.
+ * This is done to support incremental update of the database.
* The temporary table file_cache is dropped thereafter in the function
* update_db(), once the database has been updated.
*/
@@ -693,7 +693,7 @@ update_existing_entry(sqlite3 *db, const
}
/* update_db --
- * Does an incremental updation of the database by checking the file_cache.
+ * Does an incremental update of the database by checking the file_cache.
* It parses and adds the pages which are present in file_cache,
* but not in the database.
* It also removes the pages which are present in the database,
@@ -1219,7 +1219,7 @@ pman_block(const struct roff_node *n, ma
* 1. If the present section is NAME, then it will:
* (a) Extract the name of the page (in case of multiple comma separated
* names, it will pick up the first one).
- * (b) Build a space spearated list of all the symlinks/hardlinks to
+ * (b) Build a space separated list of all the symlinks/hardlinks to
* this page and store in the buffer 'links'. These are extracted from
* the comma separated list of names in the NAME section as well.
* (c) Move on to the one line description section, which is after the list
@@ -1690,7 +1690,7 @@ insert_into_db(sqlite3 *db, mandb_rec *r
sqlite3_finalize(stmt);
if (rc == SQLITE_CONSTRAINT_UNIQUE) {
/* The *most* probable reason for reaching here is that
- * the UNIQUE contraint on the file column of the mandb_meta
+ * the UNIQUE constraint on the file column of the mandb_meta
* table was violated.
* This can happen when a file was updated/modified.
* To fix this we need to do two things:
