Module Name: src
Committed By: andvar
Date: Sat Aug 21 09:59:47 UTC 2021
Modified Files:
src: UPDATING
src/sys/arch/sparc/conf: majors.sparc
src/sys/arch/sparc64/conf: majors.sparc64
src/sys/arch/vax/include: disklabel.h
src/sys/arch/x68k/dev: rtclock_var.h
src/sys/dev/ieee1394: fwohci.c
src/sys/dev/pci: auixp.c
src/sys/fs/udf: udf_strat_rmw.c udf_subr.c
src/sys/kern: vfs_dirhash.c
src/tests/dev/audio: audiotest.c
src/usr.sbin/makefs: udf.c
src/usr.sbin/postinstall: postinstall.in
Log Message:
s/helt/held+s/eroneously/erroneously/+s/splitted/split/+s/recommented/recommended/
To generate a diff of this commit:
cvs rdiff -u -r1.319 -r1.320 src/UPDATING
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/sparc/conf/majors.sparc
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/sparc64/conf/majors.sparc64
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/vax/include/disklabel.h
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/x68k/dev/rtclock_var.h
cvs rdiff -u -r1.146 -r1.147 src/sys/dev/ieee1394/fwohci.c
cvs rdiff -u -r1.51 -r1.52 src/sys/dev/pci/auixp.c
cvs rdiff -u -r1.28 -r1.29 src/sys/fs/udf/udf_strat_rmw.c
cvs rdiff -u -r1.155 -r1.156 src/sys/fs/udf/udf_subr.c
cvs rdiff -u -r1.13 -r1.14 src/sys/kern/vfs_dirhash.c
cvs rdiff -u -r1.14 -r1.15 src/tests/dev/audio/audiotest.c
cvs rdiff -u -r1.21 -r1.22 src/usr.sbin/makefs/udf.c
cvs rdiff -u -r1.39 -r1.40 src/usr.sbin/postinstall/postinstall.in
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.319 src/UPDATING:1.320
--- src/UPDATING:1.319 Sun Jul 11 21:58:52 2021
+++ src/UPDATING Sat Aug 21 09:59:45 2021
@@ -1,4 +1,4 @@
-$NetBSD: UPDATING,v 1.319 2021/07/11 21:58:52 mrg Exp $
+$NetBSD: UPDATING,v 1.320 2021/08/21 09:59:45 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
@@ -398,7 +398,7 @@ Recent changes:
to IPSEC (and the older IPSEC version removed).
20130605:
- Previous freetype installations eroneously installed private
+ Previous freetype installations erroneously installed private
header files. If you are building against a non-empty $DESTDIR,
please remove ${DESTDIR}//usr/X11R7/include/freetype2/freetype/.
@@ -538,7 +538,7 @@ Recent changes:
build problems with xsrc.
20100522:
- private section of <ctype.h> was splitted, and now mklocale(1)
+ private section of <ctype.h> was split, and now mklocale(1)
include ctype_local.h, so you have to make cleandir in tools/mklocale.
20100520:
@@ -609,7 +609,7 @@ Recent changes:
20090202:
pkg_install now depends on the pkgdb cache for automatic conflict
- detection. It is recommented to rebuild the cache with
+ detection. It is recommended to rebuild the cache with
``pkg_admin rebuild''.
20090110:
Index: src/sys/arch/sparc/conf/majors.sparc
diff -u src/sys/arch/sparc/conf/majors.sparc:1.40 src/sys/arch/sparc/conf/majors.sparc:1.41
--- src/sys/arch/sparc/conf/majors.sparc:1.40 Sat Apr 4 16:06:16 2020
+++ src/sys/arch/sparc/conf/majors.sparc Sat Aug 21 09:59:45 2021
@@ -1,4 +1,4 @@
-# $NetBSD: majors.sparc,v 1.40 2020/04/04 16:06:16 jdolecek Exp $
+# $NetBSD: majors.sparc,v 1.41 2021/08/21 09:59:45 andvar Exp $
#
# Device majors for sparc
#
@@ -127,7 +127,7 @@ device-major joy char 137 joy
# New machine-independent driver majors are assigned in
# sys/conf/majors.
-# ld has (eroneously) been assigned a MD major on some ports, this one
+# ld has (erroneously) been assigned a MD major on some ports, this one
# is from the (mostly unused) sys/conf/majors.storage
device-major ld char 303 block 303 ld
Index: src/sys/arch/sparc64/conf/majors.sparc64
diff -u src/sys/arch/sparc64/conf/majors.sparc64:1.40 src/sys/arch/sparc64/conf/majors.sparc64:1.41
--- src/sys/arch/sparc64/conf/majors.sparc64:1.40 Tue Jun 29 10:22:37 2021
+++ src/sys/arch/sparc64/conf/majors.sparc64 Sat Aug 21 09:59:45 2021
@@ -1,4 +1,4 @@
-# $NetBSD: majors.sparc64,v 1.40 2021/06/29 10:22:37 nia Exp $
+# $NetBSD: majors.sparc64,v 1.41 2021/08/21 09:59:45 andvar Exp $
#
# Device majors for sparc64
#
@@ -124,6 +124,6 @@ device-major joy char 137 joy
# New machine-independent driver majors are assigned in
# sys/conf/majors.
-# ld has (eroneously) been assigned a MD major on some ports, this one
+# ld has (erroneously) been assigned a MD major on some ports, this one
# is from the (mostly unused) sys/conf/majors.storage
device-major ld char 303 block 303 ld
Index: src/sys/arch/vax/include/disklabel.h
diff -u src/sys/arch/vax/include/disklabel.h:1.7 src/sys/arch/vax/include/disklabel.h:1.8
--- src/sys/arch/vax/include/disklabel.h:1.7 Thu Apr 4 12:50:03 2013
+++ src/sys/arch/vax/include/disklabel.h Sat Aug 21 09:59:46 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.h,v 1.7 2013/04/04 12:50:03 martin Exp $ */
+/* $NetBSD: disklabel.h,v 1.8 2021/08/21 09:59:46 andvar Exp $ */
/*
* Copyright (c) 1994 Christopher G. Demetriou
@@ -40,7 +40,7 @@
#define OLDMAXPARTITIONS 8 /* number of partitions before nb-6 */
#define RAW_PART 2 /* raw partition: xx?c */
/*
- * In NetBSD 6 we eroneously used a too large MAXPARTITIONS value (disklabel
+ * In NetBSD 6 we erroneously used a too large MAXPARTITIONS value (disklabel
* overlapped with important parts of the bootblocks and made some machines
* unbootable).
*/
Index: src/sys/arch/x68k/dev/rtclock_var.h
diff -u src/sys/arch/x68k/dev/rtclock_var.h:1.11 src/sys/arch/x68k/dev/rtclock_var.h:1.12
--- src/sys/arch/x68k/dev/rtclock_var.h:1.11 Sat Jan 3 09:32:13 2009
+++ src/sys/arch/x68k/dev/rtclock_var.h Sat Aug 21 09:59:46 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: rtclock_var.h,v 1.11 2009/01/03 09:32:13 isaki Exp $ */
+/* $NetBSD: rtclock_var.h,v 1.12 2021/08/21 09:59:46 andvar Exp $ */
/*
* Copyright 1993, 1994 Masaru Oki
@@ -31,7 +31,7 @@
*/
/*
- * Should be splitted to _reg.h and _var.h
+ * Should be split to _reg.h and _var.h
*/
#ifndef _RTCLOCKVAR_H_
Index: src/sys/dev/ieee1394/fwohci.c
diff -u src/sys/dev/ieee1394/fwohci.c:1.146 src/sys/dev/ieee1394/fwohci.c:1.147
--- src/sys/dev/ieee1394/fwohci.c:1.146 Sat Aug 7 16:19:12 2021
+++ src/sys/dev/ieee1394/fwohci.c Sat Aug 21 09:59:46 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: fwohci.c,v 1.146 2021/08/07 16:19:12 thorpej Exp $ */
+/* $NetBSD: fwohci.c,v 1.147 2021/08/21 09:59:46 andvar Exp $ */
/*-
* Copyright (c) 2003 Hidetoshi Shimokawa
@@ -37,7 +37,7 @@
*
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fwohci.c,v 1.146 2021/08/07 16:19:12 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fwohci.c,v 1.147 2021/08/21 09:59:46 andvar Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -2683,7 +2683,7 @@ fwohci_arcv_swap(struct fw_pkt *fp, int
hlen = tinfo[fp0->mode.common.tcode].hdr_len;
if (hlen > len) {
if (firewire_debug)
- printf("splitted header\n");
+ printf("split header\n");
return len - hlen;
}
#if BYTE_ORDER == BIG_ENDIAN
@@ -2796,7 +2796,7 @@ fwohci_arcv(struct fwohci_softc *sc, str
void *buf;
if (dbch->buf_offset < 0) {
- /* splitted in header, pull up */
+ /* split in header, pull up */
char *p;
rlen -= dbch->buf_offset;
@@ -2824,7 +2824,7 @@ fwohci_arcv(struct fwohci_softc *sc, str
vec[0].iov_base = (char *)&pktbuf;
vec[0].iov_len = offset;
} else {
- /* splitted in payload */
+ /* split in payload */
buf = (char *)dbch->pdb_tr->buf +
dbch->buf_offset;
rlen = psize - dbch->buf_offset;
@@ -2874,7 +2874,7 @@ fwohci_arcv(struct fwohci_softc *sc, str
if (len < 0) {
dbch->pdb_tr = db_tr;
if (firewire_debug)
- printf("splitted payload\n");
+ printf("split payload\n");
/* sanity check */
if (resCount != 0) {
aprint_error_dev(sc->fc.dev,
Index: src/sys/dev/pci/auixp.c
diff -u src/sys/dev/pci/auixp.c:1.51 src/sys/dev/pci/auixp.c:1.52
--- src/sys/dev/pci/auixp.c:1.51 Fri Aug 20 20:25:28 2021
+++ src/sys/dev/pci/auixp.c Sat Aug 21 09:59:46 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: auixp.c,v 1.51 2021/08/20 20:25:28 andvar Exp $ */
+/* $NetBSD: auixp.c,v 1.52 2021/08/21 09:59:46 andvar Exp $ */
/*
* Copyright (c) 2004, 2005 Reinoud Zandijk <rein...@netbsd.org>
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: auixp.c,v 1.51 2021/08/20 20:25:28 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auixp.c,v 1.52 2021/08/21 09:59:46 andvar Exp $");
#include <sys/types.h>
#include <sys/errno.h>
@@ -360,7 +360,7 @@ auixp_commit_settings(void *hdl)
value &= ~ATI_REG_CMD_SPDF_CONFIG_MASK;
value |= ATI_REG_CMD_SPDF_CONFIG_34; /* NetBSD AC'97 default */
- /* XXX this prolly is not necessary unless splitted XXX */
+ /* XXX this prolly is not necessary unless split XXX */
value &= ~ATI_REG_CMD_INTERLEAVE_SPDF;
if (params->precision <= 16)
value |= ATI_REG_CMD_INTERLEAVE_SPDF;
Index: src/sys/fs/udf/udf_strat_rmw.c
diff -u src/sys/fs/udf/udf_strat_rmw.c:1.28 src/sys/fs/udf/udf_strat_rmw.c:1.29
--- src/sys/fs/udf/udf_strat_rmw.c:1.28 Tue May 24 09:55:57 2016
+++ src/sys/fs/udf/udf_strat_rmw.c Sat Aug 21 09:59:46 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_strat_rmw.c,v 1.28 2016/05/24 09:55:57 reinoud Exp $ */
+/* $NetBSD: udf_strat_rmw.c,v 1.29 2021/08/21 09:59:46 andvar Exp $ */
/*
* Copyright (c) 2006, 2008 Reinoud Zandijk
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__KERNEL_RCSID(0, "$NetBSD: udf_strat_rmw.c,v 1.28 2016/05/24 09:55:57 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udf_strat_rmw.c,v 1.29 2021/08/21 09:59:46 andvar Exp $");
#endif /* not lint */
@@ -171,7 +171,7 @@ udf_lock_eccline(struct udf_eccline *ecc
ret = cv_timedwait(&priv->discstrat_cv, &priv->discstrat_mutex,
hz/8);
if (ret == EWOULDBLOCK)
- DPRINTF(LOCKING, ("eccline lock helt, waiting for "
+ DPRINTF(LOCKING, ("eccline lock held, waiting for "
"release"));
}
eccline->flags |= ECC_LOCKED;
Index: src/sys/fs/udf/udf_subr.c
diff -u src/sys/fs/udf/udf_subr.c:1.155 src/sys/fs/udf/udf_subr.c:1.156
--- src/sys/fs/udf/udf_subr.c:1.155 Fri Aug 20 20:25:28 2021
+++ src/sys/fs/udf/udf_subr.c Sat Aug 21 09:59:46 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_subr.c,v 1.155 2021/08/20 20:25:28 andvar Exp $ */
+/* $NetBSD: udf_subr.c,v 1.156 2021/08/21 09:59:46 andvar Exp $ */
/*
* Copyright (c) 2006, 2008 Reinoud Zandijk
@@ -29,7 +29,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__KERNEL_RCSID(0, "$NetBSD: udf_subr.c,v 1.155 2021/08/20 20:25:28 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udf_subr.c,v 1.156 2021/08/21 09:59:46 andvar Exp $");
#endif /* not lint */
@@ -5202,7 +5202,7 @@ udf_dir_attach(struct udf_mount *ump, st
addr_type = icbflags & UDF_ICB_TAG_FLAGS_ALLOC_MASK;
}
- /* make sure the next fid desc_tag won't be splitted */
+ /* make sure the next fid desc_tag won't be split */
if (addr_type != UDF_ICB_INTERN_ALLOC) {
end_fid_pos = chosen_fid_pos + chosen_size;
lb_rest = lb_size - (end_fid_pos % lb_size);
Index: src/sys/kern/vfs_dirhash.c
diff -u src/sys/kern/vfs_dirhash.c:1.13 src/sys/kern/vfs_dirhash.c:1.14
--- src/sys/kern/vfs_dirhash.c:1.13 Sun Feb 10 17:13:33 2019
+++ src/sys/kern/vfs_dirhash.c Sat Aug 21 09:59:46 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_dirhash.c,v 1.13 2019/02/10 17:13:33 christos Exp $ */
+/* $NetBSD: vfs_dirhash.c,v 1.14 2021/08/21 09:59:46 andvar Exp $ */
/*
* Copyright (c) 2008 Reinoud Zandijk
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_dirhash.c,v 1.13 2019/02/10 17:13:33 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_dirhash.c,v 1.14 2021/08/21 09:59:46 andvar Exp $");
/* CLEAN UP! */
#include <sys/param.h>
@@ -55,7 +55,7 @@ __KERNEL_RCSID(0, "$NetBSD: vfs_dirhash.
*
* The global dirhash_queue is protected by the dirhashmutex. This lock is
* internal only and is FS/mountpoint/vnode independent. On exit of the
- * exported functions this mutex is not helt.
+ * exported functions this mutex is not held.
*
* The dirhash structure is considered part of the vnode/inode/udf_node
* structure and will thus use the lock that protects that vnode/inode.
Index: src/tests/dev/audio/audiotest.c
diff -u src/tests/dev/audio/audiotest.c:1.14 src/tests/dev/audio/audiotest.c:1.15
--- src/tests/dev/audio/audiotest.c:1.14 Wed Jul 21 06:18:32 2021
+++ src/tests/dev/audio/audiotest.c Sat Aug 21 09:59:46 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: audiotest.c,v 1.14 2021/07/21 06:18:32 isaki Exp $ */
+/* $NetBSD: audiotest.c,v 1.15 2021/08/21 09:59:46 andvar Exp $ */
/*
* Copyright (C) 2019 Tetsuya Isaki. All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: audiotest.c,v 1.14 2021/07/21 06:18:32 isaki Exp $");
+__RCSID("$NetBSD: audiotest.c,v 1.15 2021/08/21 09:59:46 andvar Exp $");
#include <errno.h>
#include <fcntl.h>
@@ -4159,7 +4159,7 @@ signal_FIOASYNC(int signo)
}
/*
- * FIOASYNC between two descriptors should be splitted.
+ * FIOASYNC between two descriptors should be split.
*/
DEF(FIOASYNC_reset)
{
Index: src/usr.sbin/makefs/udf.c
diff -u src/usr.sbin/makefs/udf.c:1.21 src/usr.sbin/makefs/udf.c:1.22
--- src/usr.sbin/makefs/udf.c:1.21 Sat Apr 18 12:25:01 2020
+++ src/usr.sbin/makefs/udf.c Sat Aug 21 09:59:46 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: udf.c,v 1.21 2020/04/18 12:25:01 martin Exp $ */
+/* $NetBSD: udf.c,v 1.22 2021/08/21 09:59:46 andvar Exp $ */
/*
* Copyright (c) 2006, 2008, 2013 Reinoud Zandijk
@@ -30,7 +30,7 @@
#endif
#include <sys/cdefs.h>
-__RCSID("$NetBSD: udf.c,v 1.21 2020/04/18 12:25:01 martin Exp $");
+__RCSID("$NetBSD: udf.c,v 1.22 2021/08/21 09:59:46 andvar Exp $");
#include <stdio.h>
#include <stdlib.h>
@@ -67,7 +67,7 @@ __RCSID("$NetBSD: udf.c,v 1.21 2020/04/1
/*
* Note: due to the setup of the newfs code, the current state of the program
- * and its options are helt in a few global variables. The FS specific parts
+ * and its options are held in a few global variables. The FS specific parts
* are in a global `context' structure.
*/
Index: src/usr.sbin/postinstall/postinstall.in
diff -u src/usr.sbin/postinstall/postinstall.in:1.39 src/usr.sbin/postinstall/postinstall.in:1.40
--- src/usr.sbin/postinstall/postinstall.in:1.39 Mon Jun 7 05:29:22 2021
+++ src/usr.sbin/postinstall/postinstall.in Sat Aug 21 09:59:47 2021
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postinstall.in,v 1.39 2021/06/07 05:29:22 mlelstv Exp $
+# $NetBSD: postinstall.in,v 1.40 2021/08/21 09:59:47 andvar Exp $
#
# Copyright (c) 2002-2021 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -1252,13 +1252,13 @@ do_dhcpcdrundir()
if [ -d "${DEST_DIR}/@RUNDIR@" ]; then
if [ "${op}" = "check" ]; then
- msg "Remove eroneously created /@RUNDIR@"
+ msg "Remove erroneously created /@RUNDIR@"
failed=1
elif ! rm -r "${DEST_DIR}/@RUNDIR@"; then
msg "Failed to remove ${DEST_DIR}/@RUNDIR@"
failed=1
else
- msg "Removed eroneously created ${DEST_DIR}/@RUNDIR@"
+ msg "Removed erroneously created ${DEST_DIR}/@RUNDIR@"
fi
fi
return ${failed}
