Module Name: src
Committed By: andvar
Date: Tue Dec 7 21:37:37 UTC 2021
Modified Files:
src: UPDATING
src/sys/arch/aarch64/aarch64: pmap.c
src/sys/arch/m68k/fpsp: res_func.sa
src/sys/dev/acpi: vald_acpi.c
src/sys/dev/nand: hamming.c
src/sys/ufs/chfs: chfs.h chfs_malloc.c chfs_nodeops.c chfs_vnops.c
chfs_write.c ebh.c
src/usr.bin/mail: list.c
Log Message:
fix various typos, mainly in comments.
To generate a diff of this commit:
cvs rdiff -u -r1.325 -r1.326 src/UPDATING
cvs rdiff -u -r1.119 -r1.120 src/sys/arch/aarch64/aarch64/pmap.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/m68k/fpsp/res_func.sa
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/acpi/vald_acpi.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/nand/hamming.c
cvs rdiff -u -r1.10 -r1.11 src/sys/ufs/chfs/chfs.h
cvs rdiff -u -r1.6 -r1.7 src/sys/ufs/chfs/chfs_malloc.c \
src/sys/ufs/chfs/chfs_write.c
cvs rdiff -u -r1.4 -r1.5 src/sys/ufs/chfs/chfs_nodeops.c
cvs rdiff -u -r1.46 -r1.47 src/sys/ufs/chfs/chfs_vnops.c
cvs rdiff -u -r1.8 -r1.9 src/sys/ufs/chfs/ebh.c
cvs rdiff -u -r1.28 -r1.29 src/usr.bin/mail/list.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/UPDATING
diff -u src/UPDATING:1.325 src/UPDATING:1.326
--- src/UPDATING:1.325 Mon Nov 22 12:30:34 2021
+++ src/UPDATING Tue Dec 7 21:37:36 2021
@@ -1,4 +1,4 @@
-$NetBSD: UPDATING,v 1.325 2021/11/22 12:30:34 martin Exp $
+$NetBSD: UPDATING,v 1.326 2021/12/07 21:37:36 andvar Exp $
This file (UPDATING) is intended to be a brief reference to recent
changes that might cause problems in the build process, and a guide for
@@ -192,7 +192,7 @@ Recent changes:
20190723:
The jemalloc allocator in libc is now build without extended
debugging (for performance reasons). In update builds make sure
- to rebuild it completly, by removing all affected object files,
+ to rebuild it completely, by removing all affected object files,
including compat builds, something like:
cd /usr/obj && find . -type d -name jemalloc|xargs rm -rf
Index: src/sys/arch/aarch64/aarch64/pmap.c
diff -u src/sys/arch/aarch64/aarch64/pmap.c:1.119 src/sys/arch/aarch64/aarch64/pmap.c:1.120
--- src/sys/arch/aarch64/aarch64/pmap.c:1.119 Sat Oct 23 06:49:46 2021
+++ src/sys/arch/aarch64/aarch64/pmap.c Tue Dec 7 21:37:36 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.119 2021/10/23 06:49:46 skrll Exp $ */
+/* $NetBSD: pmap.c,v 1.120 2021/12/07 21:37:36 andvar Exp $ */
/*
* Copyright (c) 2017 Ryo Shimizu <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.119 2021/10/23 06:49:46 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.120 2021/12/07 21:37:36 andvar Exp $");
#include "opt_arm_debug.h"
#include "opt_ddb.h"
@@ -179,7 +179,7 @@ PMAP_COUNTER(unwire_failure, "pmap_unwir
/*
* require access permission in pte to invalidate instruction cache.
- * change the pte to accessible temporarly before cpu_icache_sync_range().
+ * change the pte to be accessible temporarily before cpu_icache_sync_range().
* this macro modifies PTE (*ptep). need to update PTE after this.
*/
#define PTE_ICACHE_SYNC_PAGE(pte, ptep, asid, va, ll) \
Index: src/sys/arch/m68k/fpsp/res_func.sa
diff -u src/sys/arch/m68k/fpsp/res_func.sa:1.5 src/sys/arch/m68k/fpsp/res_func.sa:1.6
--- src/sys/arch/m68k/fpsp/res_func.sa:1.5 Sun Sep 16 16:34:32 2001
+++ src/sys/arch/m68k/fpsp/res_func.sa Tue Dec 7 21:37:36 2021
@@ -1,4 +1,4 @@
-* $NetBSD: res_func.sa,v 1.5 2001/09/16 16:34:32 wiz Exp $
+* $NetBSD: res_func.sa,v 1.6 2021/12/07 21:37:36 andvar Exp $
* MOTOROLA MICROPROCESSOR & MEMORY TECHNOLOGY GROUP
* M68000 Hi-Performance Microprocessor Division
@@ -438,7 +438,7 @@ fix_stk:
*
* cu_dnrm handles all cu-only instructions (fmove, fabs, fneg, and
-* ftst) completly in software without an frestore to the 040.
+* ftst) completely in software without an frestore to the 040.
*
cu_dnrm:
st.b CU_ONLY(a6)
Index: src/sys/dev/acpi/vald_acpi.c
diff -u src/sys/dev/acpi/vald_acpi.c:1.7 src/sys/dev/acpi/vald_acpi.c:1.8
--- src/sys/dev/acpi/vald_acpi.c:1.7 Mon Nov 1 21:28:03 2021
+++ src/sys/dev/acpi/vald_acpi.c Tue Dec 7 21:37:36 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: vald_acpi.c,v 1.7 2021/11/01 21:28:03 andvar Exp $ */
+/* $NetBSD: vald_acpi.c,v 1.8 2021/12/07 21:37:36 andvar Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -74,7 +74,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vald_acpi.c,v 1.7 2021/11/01 21:28:03 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vald_acpi.c,v 1.8 2021/12/07 21:37:36 andvar Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -439,7 +439,7 @@ vald_acpi_libright_get_bus(ACPI_HANDLE h
sc->lcd_handle = handle;
param = buf.Pointer;
if (param->Type == ACPI_TYPE_PACKAGE) {
- printf("_BCL retrun: %d packages\n", param->Package.Count);
+ printf("_BCL return: %d packages\n", param->Package.Count);
sc->lcd_num = param->Package.Count;
sc->lcd_level = ACPI_ALLOCATE(sizeof(int) * sc->lcd_num);
Index: src/sys/dev/nand/hamming.c
diff -u src/sys/dev/nand/hamming.c:1.1 src/sys/dev/nand/hamming.c:1.2
--- src/sys/dev/nand/hamming.c:1.1 Sat Feb 26 18:07:31 2011
+++ src/sys/dev/nand/hamming.c Tue Dec 7 21:37:37 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: hamming.c,v 1.1 2011/02/26 18:07:31 ahoka Exp $ */
+/* $NetBSD: hamming.c,v 1.2 2021/12/07 21:37:37 andvar Exp $ */
/*
* Copyright (c) 2008, Atmel Corporation
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hamming.c,v 1.1 2011/02/26 18:07:31 ahoka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hamming.c,v 1.2 2021/12/07 21:37:37 andvar Exp $");
#include <sys/param.h>
#include <lib/libkern/libkern.h>
@@ -102,7 +102,7 @@ hamming_compute_256(const uint8_t *data,
/*-
* At this point, we have the line parities, and the column sum.
- * First, We must caculate the parity group values on the column sum.
+ * First, We must calculate the parity group values on the column sum.
*/
for (i = 0; i < 8; i++) {
if (column_sum & 1) {
Index: src/sys/ufs/chfs/chfs.h
diff -u src/sys/ufs/chfs/chfs.h:1.10 src/sys/ufs/chfs/chfs.h:1.11
--- src/sys/ufs/chfs/chfs.h:1.10 Thu Apr 19 21:50:10 2018
+++ src/sys/ufs/chfs/chfs.h Tue Dec 7 21:37:37 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: chfs.h,v 1.10 2018/04/19 21:50:10 christos Exp $ */
+/* $NetBSD: chfs.h,v 1.11 2021/12/07 21:37:37 andvar Exp $ */
/*-
* Copyright (c) 2010 Department of Software Engineering,
@@ -199,7 +199,7 @@ struct chfs_dirent
uint8_t name[0]; /* name of the directory */
};
-/* struct chfs_tmp_dnode - used temporarly while building a data node */
+/* struct chfs_tmp_dnode - used temporarily while building a data node */
struct chfs_tmp_dnode {
struct chfs_full_dnode *node; /* associated full dnode */
uint64_t version; /* version of the tmp node */
@@ -376,7 +376,7 @@ struct chfs_mount {
/*
* eraseblock queues
- * free: completly free
+ * free: completely free
* clean: contains only valid data
* dirty: contains valid and deleted data
* very_dirty: contains mostly deleted data (should be GC'd)
Index: src/sys/ufs/chfs/chfs_malloc.c
diff -u src/sys/ufs/chfs/chfs_malloc.c:1.6 src/sys/ufs/chfs/chfs_malloc.c:1.7
--- src/sys/ufs/chfs/chfs_malloc.c:1.6 Mon Jun 17 17:14:56 2019
+++ src/sys/ufs/chfs/chfs_malloc.c Tue Dec 7 21:37:37 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: chfs_malloc.c,v 1.6 2019/06/17 17:14:56 ryoon Exp $ */
+/* $NetBSD: chfs_malloc.c,v 1.7 2021/12/07 21:37:37 andvar Exp $ */
/*-
* Copyright (c) 2010 Department of Software Engineering,
@@ -373,7 +373,7 @@ chfs_free_node_frag(struct chfs_node_fra
pool_cache_put(chfs_node_frag_cache, frag);
}
-/* chfs_alloc_tmp_dnode - allocating a temporarly used dnode */
+/* chfs_alloc_tmp_dnode - allocating a temporarily used dnode */
struct chfs_tmp_dnode *
chfs_alloc_tmp_dnode(void)
{
@@ -383,14 +383,14 @@ chfs_alloc_tmp_dnode(void)
return ret;
}
-/* chfs_free_tmp_dnode - freeing a temporarly used dnode */
+/* chfs_free_tmp_dnode - freeing a temporarily used dnode */
void
chfs_free_tmp_dnode(struct chfs_tmp_dnode *td)
{
pool_cache_put(chfs_tmp_dnode_cache, td);
}
-/* chfs_alloc_tmp_dnode_info - allocating a temporarly used dnode descriptor */
+/* chfs_alloc_tmp_dnode_info - allocating a temporarily used dnode descriptor */
struct chfs_tmp_dnode_info *
chfs_alloc_tmp_dnode_info(void)
{
@@ -400,7 +400,7 @@ chfs_alloc_tmp_dnode_info(void)
return ret;
}
-/* chfs_free_tmp_dnode_info - freeing a temporarly used dnode descriptor */
+/* chfs_free_tmp_dnode_info - freeing a temporarily used dnode descriptor */
void
chfs_free_tmp_dnode_info(struct chfs_tmp_dnode_info *di)
{
Index: src/sys/ufs/chfs/chfs_write.c
diff -u src/sys/ufs/chfs/chfs_write.c:1.6 src/sys/ufs/chfs/chfs_write.c:1.7
--- src/sys/ufs/chfs/chfs_write.c:1.6 Mon Jul 19 21:04:39 2021
+++ src/sys/ufs/chfs/chfs_write.c Tue Dec 7 21:37:37 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: chfs_write.c,v 1.6 2021/07/19 21:04:39 andvar Exp $ */
+/* $NetBSD: chfs_write.c,v 1.7 2021/12/07 21:37:37 andvar Exp $ */
/*-
* Copyright (c) 2010 Department of Software Engineering,
@@ -110,7 +110,7 @@ retry:
mutex_enter(&chmp->chm_lock_sizes);
- /* caculating offset and sizes */
+ /* calculating offset and sizes */
nref->nref_offset = chmp->chm_ebh->eb_size - chmp->chm_nextblock->free_size;
chfs_change_size_free(chmp, chmp->chm_nextblock, -CHFS_PAD(size));
vec.iov_base = fvnode;
Index: src/sys/ufs/chfs/chfs_nodeops.c
diff -u src/sys/ufs/chfs/chfs_nodeops.c:1.4 src/sys/ufs/chfs/chfs_nodeops.c:1.5
--- src/sys/ufs/chfs/chfs_nodeops.c:1.4 Mon Dec 9 09:35:17 2013
+++ src/sys/ufs/chfs/chfs_nodeops.c Tue Dec 7 21:37:37 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: chfs_nodeops.c,v 1.4 2013/12/09 09:35:17 wiz Exp $ */
+/* $NetBSD: chfs_nodeops.c,v 1.5 2021/12/07 21:37:37 andvar Exp $ */
/*-
* Copyright (c) 2010 Department of Software Engineering,
@@ -206,7 +206,7 @@ chfs_add_fd_to_inode(struct chfs_mount *
return;
}
}
- /* if we couldnt fit it elsewhere, lets add to the end */
+ /* if we couldn't fit it elsewhere, lets add to the end */
/* FIXME insert tail or insert head? */
TAILQ_INSERT_HEAD(&parent->dents, new, fds);
}
Index: src/sys/ufs/chfs/chfs_vnops.c
diff -u src/sys/ufs/chfs/chfs_vnops.c:1.46 src/sys/ufs/chfs/chfs_vnops.c:1.47
--- src/sys/ufs/chfs/chfs_vnops.c:1.46 Wed Oct 20 03:08:19 2021
+++ src/sys/ufs/chfs/chfs_vnops.c Tue Dec 7 21:37:37 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: chfs_vnops.c,v 1.46 2021/10/20 03:08:19 thorpej Exp $ */
+/* $NetBSD: chfs_vnops.c,v 1.47 2021/12/07 21:37:37 andvar Exp $ */
/*-
* Copyright (c) 2010 Department of Software Engineering,
@@ -158,7 +158,7 @@ chfs_lookup(void *v)
}
/* Store the result of this lookup in the cache. Avoid this if the
* request was for creation, as it does not improve timings on
- * emprical tests. */
+ * empirical tests. */
if (cnp->cn_nameiop != CREATE && (cnp->cn_flags & ISDOTDOT) == 0) {
cache_enter(dvp, *vpp, cnp->cn_nameptr, cnp->cn_namelen,
cnp->cn_flags);
Index: src/sys/ufs/chfs/ebh.c
diff -u src/sys/ufs/chfs/ebh.c:1.8 src/sys/ufs/chfs/ebh.c:1.9
--- src/sys/ufs/chfs/ebh.c:1.8 Mon Aug 9 21:38:05 2021
+++ src/sys/ufs/chfs/ebh.c Tue Dec 7 21:37:37 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ebh.c,v 1.8 2021/08/09 21:38:05 andvar Exp $ */
+/* $NetBSD: ebh.c,v 1.9 2021/12/07 21:37:37 andvar Exp $ */
/*-
* Copyright (c) 2010 Department of Software Engineering,
@@ -129,7 +129,7 @@ nand_calc_data_offs(struct chfs_ebh *ebh
}
/**
- * nor_read_eb_hdr - read ereaseblock header from NOR flash
+ * nor_read_eb_hdr - read eraseblock header from NOR flash
*
* @ebh: chfs eraseblock handler
* @pebnr: eraseblock number
@@ -167,7 +167,7 @@ nor_read_eb_hdr(struct chfs_ebh *ebh,
}
/**
- * nand_read_eb_hdr - read ereaseblock header from NAND flash
+ * nand_read_eb_hdr - read eraseblock header from NAND flash
*
* @ebh: chfs eraseblock handler
* @pebnr: eraseblock number
@@ -206,7 +206,7 @@ nand_read_eb_hdr(struct chfs_ebh *ebh, i
}
/**
- * nor_write_eb_hdr - write ereaseblock header to NOR flash
+ * nor_write_eb_hdr - write eraseblock header to NOR flash
*
* @ebh: chfs eraseblock handler
* @pebnr: eraseblock number whereto write
@@ -243,7 +243,7 @@ nor_write_eb_hdr(struct chfs_ebh *ebh, i
}
/**
- * nand_write_eb_hdr - write ereaseblock header to NAND flash
+ * nand_write_eb_hdr - write eraseblock header to NAND flash
*
* @ebh: chfs eraseblock handler
* @pebnr: eraseblock number whereto write
@@ -282,7 +282,7 @@ nand_write_eb_hdr(struct chfs_ebh *ebh,
}
/**
- * nor_check_eb_hdr - check ereaseblock header read from NOR flash
+ * nor_check_eb_hdr - check eraseblock header read from NOR flash
*
* @ebh: chfs eraseblock handler
* @buf: eraseblock header to check
@@ -361,7 +361,7 @@ nor_check_eb_hdr(struct chfs_ebh *ebh, v
}
/**
- * nand_check_eb_hdr - check ereaseblock header read from NAND flash
+ * nand_check_eb_hdr - check eraseblock header read from NAND flash
*
* @ebh: chfs eraseblock handler
* @buf: eraseblock header to check
@@ -421,7 +421,7 @@ nand_check_eb_hdr(struct chfs_ebh *ebh,
}
/**
- * nor_mark_eb_hdr_dirty_flash- mark ereaseblock header dirty on NOR flash
+ * nor_mark_eb_hdr_dirty_flash- mark eraseblock header dirty on NOR flash
*
* @ebh: chfs eraseblock handler
* @pebnr: eraseblock number
@@ -456,7 +456,7 @@ nor_mark_eb_hdr_dirty_flash(struct chfs_
}
/**
- * nor_invalidate_eb_hdr - invalidate ereaseblock header on NOR flash
+ * nor_invalidate_eb_hdr - invalidate eraseblock header on NOR flash
*
* @ebh: chfs eraseblock handler
* @pebnr: eraseblock number
@@ -491,7 +491,7 @@ nor_invalidate_eb_hdr(struct chfs_ebh *e
}
/**
- * mark_eb_hdr_free - free ereaseblock header on NOR or NAND flash
+ * mark_eb_hdr_free - free eraseblock header on NOR or NAND flash
*
* @ebh: chfs eraseblock handler
* @pebnr: eraseblock number
@@ -1423,7 +1423,7 @@ count_mean:
}
/**
- * chfs_scan - scans the media and returns informations about it
+ * chfs_scan - scans the media and returns information about it
* @ebh: chfs eraseblock handler
*
* This function scans through the media and returns information about it or if
@@ -1593,7 +1593,7 @@ out_free:
/*****************************************************************************/
/**
- * ebh_open - opens mtd device and init ereaseblock header
+ * ebh_open - opens mtd device and init eraseblock header
* @ebh: eraseblock handler
* @flash_nr: flash device number to use
*
@@ -1998,7 +1998,7 @@ write_error:
* @ebh: eraseblock handler
* @lnr: leb number
*
- * Retruns zero on success, error code in case of fail.
+ * Returns zero on success, error code in case of fail.
*/
int
ebh_unmap_leb(struct chfs_ebh *ebh, int lnr)
@@ -2019,7 +2019,7 @@ ebh_unmap_leb(struct chfs_ebh *ebh, int
* @ebh: eraseblock handler
* @lnr: leb number
*
- * Retruns 0 if the logical eraseblock is mapped, negative error code otherwise.
+ * Returns 0 if the logical eraseblock is mapped, negative error code otherwise.
*/
int
ebh_is_mapped(struct chfs_ebh *ebh, int lnr)
Index: src/usr.bin/mail/list.c
diff -u src/usr.bin/mail/list.c:1.28 src/usr.bin/mail/list.c:1.29
--- src/usr.bin/mail/list.c:1.28 Thu Nov 9 20:27:50 2017
+++ src/usr.bin/mail/list.c Tue Dec 7 21:37:37 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: list.c,v 1.28 2017/11/09 20:27:50 christos Exp $ */
+/* $NetBSD: list.c,v 1.29 2021/12/07 21:37:37 andvar Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)list.c 8.4 (Berkeley) 5/1/95";
#else
-__RCSID("$NetBSD: list.c,v 1.28 2017/11/09 20:27:50 christos Exp $");
+__RCSID("$NetBSD: list.c,v 1.29 2021/12/07 21:37:37 andvar Exp $");
#endif
#endif /* not lint */
@@ -946,7 +946,7 @@ markall_core(int *markarray, char **bufp
LOP_XOR
} logic_op; /* binary logic operation */
int logic_invert; /* invert the result */
- int *tmparray; /* temporarly array with result */
+ int *tmparray; /* temporary array with result */
int msgCount; /* tmparray length and message count */
int beg; /* first value of a range */
int colmod; /* the colon-modifier for this group */
