Module Name: src
Committed By: andvar
Date: Thu Feb 8 20:51:25 UTC 2024
Modified Files:
src/common/lib/libc/arch/arm/string: strcpy_arm.S
src/sbin/blkdiscard: blkdiscard.c
src/share/doc/papers/pulldown: 0.t
src/sys/arch/powerpc/include: psl.h
src/sys/dev/marvell: mvxpbm.c
src/sys/dev/pci: cs4280.c cs4280reg.h
src/sys/fs/nfs/client: nfs_clrpcops.c
src/usr.sbin/inetd: parse_v2.c
src/usr.sbin/sysinst: disklabel.c gpt.c mbr.c
Log Message:
fix misplaced or missing "e" in words with "ment" ending (argument, implement,
increment, decrement, alignment), in comments, documentation, log messages.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/common/lib/libc/arch/arm/string/strcpy_arm.S
cvs rdiff -u -r1.3 -r1.4 src/sbin/blkdiscard/blkdiscard.c
cvs rdiff -u -r1.1 -r1.2 src/share/doc/papers/pulldown/0.t
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/powerpc/include/psl.h
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/marvell/mvxpbm.c
cvs rdiff -u -r1.76 -r1.77 src/sys/dev/pci/cs4280.c
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/pci/cs4280reg.h
cvs rdiff -u -r1.2 -r1.3 src/sys/fs/nfs/client/nfs_clrpcops.c
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/inetd/parse_v2.c
cvs rdiff -u -r1.51 -r1.52 src/usr.sbin/sysinst/disklabel.c
cvs rdiff -u -r1.30 -r1.31 src/usr.sbin/sysinst/gpt.c
cvs rdiff -u -r1.46 -r1.47 src/usr.sbin/sysinst/mbr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/arch/arm/string/strcpy_arm.S
diff -u src/common/lib/libc/arch/arm/string/strcpy_arm.S:1.6 src/common/lib/libc/arch/arm/string/strcpy_arm.S:1.7
--- src/common/lib/libc/arch/arm/string/strcpy_arm.S:1.6 Sat Jan 14 03:35:21 2017
+++ src/common/lib/libc/arch/arm/string/strcpy_arm.S Thu Feb 8 20:51:24 2024
@@ -29,7 +29,7 @@
#include <machine/asm.h>
-RCSID("$NetBSD: strcpy_arm.S,v 1.6 2017/01/14 03:35:21 christos Exp $")
+RCSID("$NetBSD: strcpy_arm.S,v 1.7 2024/02/08 20:51:24 andvar Exp $")
#ifdef STRLCPY
#ifdef _LIBC
@@ -248,9 +248,9 @@ ENTRY(FUNCNAME)
*/
mov r3, #24 /* assume NUL is in byte 3 */
tst r5, #BYTE1 /* did we find a NUL in byte 1? */
- subeq r3, r3, #8 /* yes, decremnt byte position */
+ subeq r3, r3, #8 /* yes, decrement byte position */
tstne r5, #BYTE2 /* no, did we find a NUL in byte 2? */
- subeq r3, r3, #8 /* yes, decremnt byte position */
+ subeq r3, r3, #8 /* yes, decrement byte position */
tstne r5, #BYTE3 /* no, did we find a NUL in byte 3? */
bne .Lincongruent_mainloop_load /* no, no NUL encountered! */
#endif
Index: src/sbin/blkdiscard/blkdiscard.c
diff -u src/sbin/blkdiscard/blkdiscard.c:1.3 src/sbin/blkdiscard/blkdiscard.c:1.4
--- src/sbin/blkdiscard/blkdiscard.c:1.3 Thu Jan 25 02:42:17 2024
+++ src/sbin/blkdiscard/blkdiscard.c Thu Feb 8 20:51:24 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: blkdiscard.c,v 1.3 2024/01/25 02:42:17 mrg Exp $ */
+/* $NetBSD: blkdiscard.c,v 1.4 2024/02/08 20:51:24 andvar Exp $ */
/*
* Copyright (c) 2019, 2020, 2022, 2024 Matthew R. Green
@@ -155,7 +155,7 @@ main(int argc, char *argv[])
argv += optind;
if (secure)
- usage("blkdiscard: secure erase not yet implemnted\n");
+ usage("blkdiscard: secure erase not yet implemented\n");
if (zeroout) {
zeros = calloc(1, max_per_call);
if (!zeros)
Index: src/share/doc/papers/pulldown/0.t
diff -u src/share/doc/papers/pulldown/0.t:1.1 src/share/doc/papers/pulldown/0.t:1.2
--- src/share/doc/papers/pulldown/0.t:1.1 Wed Jul 4 05:29:25 2001
+++ src/share/doc/papers/pulldown/0.t Thu Feb 8 20:51:24 2024
@@ -1,4 +1,4 @@
-.\" $Id: 0.t,v 1.1 2001/07/04 05:29:25 itojun Exp $
+.\" $Id: 0.t,v 1.2 2024/02/08 20:51:24 andvar Exp $
.\"
.EQ
delim $$
@@ -7,7 +7,7 @@ delim $$
.TL
Mbuf issues in 4.4BSD IPv6/IPsec support
.br
-\(em experiences from KAME IPv6/IPsec implemntation \(em
+\(em experiences from KAME IPv6/IPsec implementation \(em
.AU
Jun-ichiro itojun Hagino
.AI
Index: src/sys/arch/powerpc/include/psl.h
diff -u src/sys/arch/powerpc/include/psl.h:1.22 src/sys/arch/powerpc/include/psl.h:1.23
--- src/sys/arch/powerpc/include/psl.h:1.22 Sat Mar 6 08:08:19 2021
+++ src/sys/arch/powerpc/include/psl.h Thu Feb 8 20:51:24 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: psl.h,v 1.22 2021/03/06 08:08:19 rin Exp $ */
+/* $NetBSD: psl.h,v 1.23 2024/02/08 20:51:24 andvar Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -74,7 +74,7 @@
#define PSL_601_MASK ~(PSL_VEC|PSL_POW|PSL_ILE|PSL_BE|PSL_RI|PSL_LE)
-/* The IBM 970 series does not implemnt LE mode */
+/* The IBM 970 series does not implement LE mode */
#define PSL_970_MASK ~(PSL_ILE|PSL_LE)
/*
Index: src/sys/dev/marvell/mvxpbm.c
diff -u src/sys/dev/marvell/mvxpbm.c:1.3 src/sys/dev/marvell/mvxpbm.c:1.4
--- src/sys/dev/marvell/mvxpbm.c:1.3 Sun Dec 5 03:04:41 2021
+++ src/sys/dev/marvell/mvxpbm.c Thu Feb 8 20:51:24 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: mvxpbm.c,v 1.3 2021/12/05 03:04:41 msaitoh Exp $ */
+/* $NetBSD: mvxpbm.c,v 1.4 2024/02/08 20:51:24 andvar Exp $ */
/*
* Copyright (c) 2015 Internet Initiative Japan Inc.
* All rights reserved.
@@ -25,7 +25,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mvxpbm.c,v 1.3 2021/12/05 03:04:41 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mvxpbm.c,v 1.4 2024/02/08 20:51:24 andvar Exp $");
#include "opt_multiprocessor.h"
@@ -186,7 +186,7 @@ mvxpbm_alloc_buffer(struct mvxpbm_softc
/*
* adjust bm_chunk_size, bm_chunk_header_size, bm_slotsize
- * to satisfy alignemnt restrictions.
+ * to satisfy alignment restrictions.
*
* <---------------- bm_slotsize [oct.] ------------------>
* <--- bm_chunk_size[oct.] ---->
Index: src/sys/dev/pci/cs4280.c
diff -u src/sys/dev/pci/cs4280.c:1.76 src/sys/dev/pci/cs4280.c:1.77
--- src/sys/dev/pci/cs4280.c:1.76 Wed Dec 20 05:08:34 2023
+++ src/sys/dev/pci/cs4280.c Thu Feb 8 20:51:24 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: cs4280.c,v 1.76 2023/12/20 05:08:34 thorpej Exp $ */
+/* $NetBSD: cs4280.c,v 1.77 2024/02/08 20:51:24 andvar Exp $ */
/*
* Copyright (c) 1999, 2000 Tatoku Ogaito. All rights reserved.
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cs4280.c,v 1.76 2023/12/20 05:08:34 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cs4280.c,v 1.77 2024/02/08 20:51:24 andvar Exp $");
#include "midi.h"
@@ -1083,7 +1083,7 @@ cs4280_set_dac_rate(struct cs428x_softc
* playback rate may range from 8000Hz to 48000Hz
*
* play_phase_increment = floor(rate*65536*1024/48000)
- * px = round(rate*65536*1024 - play_phase_incremnt*48000)
+ * px = round(rate*65536*1024 - play_phase_increment*48000)
* py=floor(px/200)
* play_sample_rate_correction = px - 200*py
*
Index: src/sys/dev/pci/cs4280reg.h
diff -u src/sys/dev/pci/cs4280reg.h:1.8 src/sys/dev/pci/cs4280reg.h:1.9
--- src/sys/dev/pci/cs4280reg.h:1.8 Wed May 8 13:40:18 2019
+++ src/sys/dev/pci/cs4280reg.h Thu Feb 8 20:51:24 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: cs4280reg.h,v 1.8 2019/05/08 13:40:18 isaki Exp $ */
+/* $NetBSD: cs4280reg.h,v 1.9 2024/02/08 20:51:24 andvar Exp $ */
/*
* Copyright (c) 1999, 2000 Tatoku Ogaito. All rights reserved.
@@ -192,7 +192,7 @@
#define CCI_MASK 0xffff0000
#define CS4280_CD 0x02e0 /* Capture Delay */
#define CD_MASK 0xfffc000
-#define CS4280_CPI 0x02f4 /* Capture Phase Incremnt */
+#define CS4280_CPI 0x02f4 /* Capture Phase Increment */
#define CS4280_CGL 0x0134 /* Capture Group Length */
#define CGL_MASK 0x0000ffff
#define CS4280_CNT 0x0340 /* Capture Number of Triplets */
Index: src/sys/fs/nfs/client/nfs_clrpcops.c
diff -u src/sys/fs/nfs/client/nfs_clrpcops.c:1.2 src/sys/fs/nfs/client/nfs_clrpcops.c:1.3
--- src/sys/fs/nfs/client/nfs_clrpcops.c:1.2 Tue Dec 13 22:17:33 2016
+++ src/sys/fs/nfs/client/nfs_clrpcops.c Thu Feb 8 20:51:25 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_clrpcops.c,v 1.2 2016/12/13 22:17:33 pgoyette Exp $ */
+/* $NetBSD: nfs_clrpcops.c,v 1.3 2024/02/08 20:51:25 andvar Exp $ */
/*-
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
@@ -34,7 +34,7 @@
#include <sys/cdefs.h>
/* __FBSDID("FreeBSD: head/sys/fs/nfsclient/nfs_clrpcops.c 298788 2016-04-29 16:07:25Z pfg "); */
-__RCSID("$NetBSD: nfs_clrpcops.c,v 1.2 2016/12/13 22:17:33 pgoyette Exp $");
+__RCSID("$NetBSD: nfs_clrpcops.c,v 1.3 2024/02/08 20:51:25 andvar Exp $");
/*
* Rpc op calls, generally called from the vnode op calls or through the
@@ -1022,7 +1022,7 @@ nfsrpc_getattr(vnode_t vp, struct ucred
}
/*
- * nfs getattr call with non-vnode arguemnts.
+ * nfs getattr call with non-vnode arguments.
*/
APPLESTATIC int
nfsrpc_getattrnovp(struct nfsmount *nmp, u_int8_t *fhp, int fhlen, int syscred,
Index: src/usr.sbin/inetd/parse_v2.c
diff -u src/usr.sbin/inetd/parse_v2.c:1.6 src/usr.sbin/inetd/parse_v2.c:1.7
--- src/usr.sbin/inetd/parse_v2.c:1.6 Tue Oct 12 19:08:04 2021
+++ src/usr.sbin/inetd/parse_v2.c Thu Feb 8 20:51:25 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: parse_v2.c,v 1.6 2021/10/12 19:08:04 christos Exp $ */
+/* $NetBSD: parse_v2.c,v 1.7 2024/02/08 20:51:25 andvar Exp $ */
/*-
* Copyright (c) 2021 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: parse_v2.c,v 1.6 2021/10/12 19:08:04 christos Exp $");
+__RCSID("$NetBSD: parse_v2.c,v 1.7 2024/02/08 20:51:25 andvar Exp $");
#include <ctype.h>
#include <errno.h>
@@ -134,7 +134,7 @@ static struct key_handler {
#define WAIT_WRN "Option 'wait' for internal service '%s' was inferred"
-/* Too Few Arguemnts (values) */
+/* Too Few Arguments (values) */
#define TFA(key) ERR("Option '%s' has too few arguments", (key))
/* Too Many Arguments (values) */
Index: src/usr.sbin/sysinst/disklabel.c
diff -u src/usr.sbin/sysinst/disklabel.c:1.51 src/usr.sbin/sysinst/disklabel.c:1.52
--- src/usr.sbin/sysinst/disklabel.c:1.51 Fri Jan 6 15:05:52 2023
+++ src/usr.sbin/sysinst/disklabel.c Thu Feb 8 20:51:24 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.c,v 1.51 2023/01/06 15:05:52 martin Exp $ */
+/* $NetBSD: disklabel.c,v 1.52 2024/02/08 20:51:24 andvar Exp $ */
/*
* Copyright 2018 The NetBSD Foundation, Inc.
@@ -79,7 +79,7 @@ disklabel_init_default_alignment(struct
if (MD_DISKLABEL_SET_ALIGN_PRE(parts->ptn_alignment, track))
return;
#endif
- /* Use 1MB alignemnt for large (>128GB) disks */
+ /* Use 1MB alignment for large (>128GB) disks */
if (parts->dp.disk_size > HUGE_DISK_SIZE) {
parts->ptn_alignment = 2048;
} else if (parts->dp.disk_size > TINY_DISK_SIZE ||
Index: src/usr.sbin/sysinst/gpt.c
diff -u src/usr.sbin/sysinst/gpt.c:1.30 src/usr.sbin/sysinst/gpt.c:1.31
--- src/usr.sbin/sysinst/gpt.c:1.30 Thu Dec 15 14:54:27 2022
+++ src/usr.sbin/sysinst/gpt.c Thu Feb 8 20:51:24 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: gpt.c,v 1.30 2022/12/15 14:54:27 martin Exp $ */
+/* $NetBSD: gpt.c,v 1.31 2024/02/08 20:51:24 andvar Exp $ */
/*
* Copyright 2018 The NetBSD Foundation, Inc.
@@ -1015,7 +1015,7 @@ gpt_get_part_alignment(const struct disk
if (parts->disk_size < 0)
return 1;
- /* Use 1MB offset/alignemnt for large (>128GB) disks */
+ /* Use 1MB offset/alignment for large (>128GB) disks */
if (parts->disk_size > HUGE_DISK_SIZE)
return 2048;
else if (parts->disk_size > TINY_DISK_SIZE)
Index: src/usr.sbin/sysinst/mbr.c
diff -u src/usr.sbin/sysinst/mbr.c:1.46 src/usr.sbin/sysinst/mbr.c:1.47
--- src/usr.sbin/sysinst/mbr.c:1.46 Sun Jul 10 12:49:05 2022
+++ src/usr.sbin/sysinst/mbr.c Thu Feb 8 20:51:24 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: mbr.c,v 1.46 2022/07/10 12:49:05 martin Exp $ */
+/* $NetBSD: mbr.c,v 1.47 2024/02/08 20:51:24 andvar Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -891,7 +891,7 @@ mbr_init_default_alignments(struct mbr_d
parts->ptn_0_offset = parts->geo_sec;
- /* Use 1MB offset/alignemnt for large (>128GB) disks */
+ /* Use 1MB offset/alignment for large (>128GB) disks */
if (parts->dp.disk_size > HUGE_DISK_SIZE) {
parts->ptn_alignment = 2048;
} else if (parts->dp.disk_size > TINY_DISK_SIZE) {
