Module Name: src
Committed By: andvar
Date: Sun Feb 4 20:50:30 UTC 2024
Modified Files:
src/etc/etc.macppc: MAKEDEV.conf
src/etc/etc.ofppc: MAKEDEV.conf
src/sys/dev/pci: mpii.c
src/sys/fs/udf: udf_subr.c
Log Message:
s/substract/subtract/ in comments.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/etc/etc.macppc/MAKEDEV.conf
cvs rdiff -u -r1.11 -r1.12 src/etc/etc.ofppc/MAKEDEV.conf
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/pci/mpii.c
cvs rdiff -u -r1.174 -r1.175 src/sys/fs/udf/udf_subr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/etc.macppc/MAKEDEV.conf
diff -u src/etc/etc.macppc/MAKEDEV.conf:1.14 src/etc/etc.macppc/MAKEDEV.conf:1.15
--- src/etc/etc.macppc/MAKEDEV.conf:1.14 Fri Aug 12 11:15:41 2022
+++ src/etc/etc.macppc/MAKEDEV.conf Sun Feb 4 20:50:30 2024
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.14 2022/08/12 11:15:41 riastradh Exp $
+# $NetBSD: MAKEDEV.conf,v 1.15 2024/02/04 20:50:30 andvar Exp $
all_md)
makedev wscons sd0 sd1 sd2 st0 st1 cd0 cd1 wd0 wd1 wd2 wd3
@@ -33,7 +33,7 @@ floppy)
tty1[0-9])
# Mac uses special mapping - tty0[01] are the zstty ports,
# tty1? are 'com' ports; for 'com' ports, we need to start
- # at correct offset, i.e. substract 10
+ # at correct offset, i.e. subtract 10
ounit=${i#tty}
ounit=$(($ounit + 0))
if [ $ounit -lt 10 ]; then
Index: src/etc/etc.ofppc/MAKEDEV.conf
diff -u src/etc/etc.ofppc/MAKEDEV.conf:1.11 src/etc/etc.ofppc/MAKEDEV.conf:1.12
--- src/etc/etc.ofppc/MAKEDEV.conf:1.11 Sun Jan 27 08:53:29 2019
+++ src/etc/etc.ofppc/MAKEDEV.conf Sun Feb 4 20:50:29 2024
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.11 2019/01/27 08:53:29 maxv Exp $
+# $NetBSD: MAKEDEV.conf,v 1.12 2024/02/04 20:50:29 andvar Exp $
all_md)
makedev wscons sd0 sd1 sd2 st0 st1 cd0 cd1 wd0 wd1 fd0 fd1
@@ -28,7 +28,7 @@ floppy)
tty1[0-9])
# Mac uses special mapping - tty0[01] are the zstty ports,
# tty1? are 'com' ports; for 'com' ports, we need to start
- # at correct offset, i.e. substract 10
+ # at correct offset, i.e. subtract 10
ounit=${i#tty}
ounit=$(($ounit + 0))
if [ $ounit -lt 10 ]; then
Index: src/sys/dev/pci/mpii.c
diff -u src/sys/dev/pci/mpii.c:1.30 src/sys/dev/pci/mpii.c:1.31
--- src/sys/dev/pci/mpii.c:1.30 Wed Oct 25 00:21:49 2023
+++ src/sys/dev/pci/mpii.c Sun Feb 4 20:50:30 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: mpii.c,v 1.30 2023/10/25 00:21:49 buhrow Exp $ */
+/* $NetBSD: mpii.c,v 1.31 2024/02/04 20:50:30 andvar Exp $ */
/* $OpenBSD: mpii.c,v 1.115 2018/08/14 05:22:21 jmatthew Exp $ */
/*
* Copyright (c) 2010, 2012 Mike Belopuhov
@@ -20,7 +20,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpii.c,v 1.30 2023/10/25 00:21:49 buhrow Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpii.c,v 1.31 2024/02/04 20:50:30 andvar Exp $");
#include "bio.h"
@@ -3685,7 +3685,7 @@ mpii_bio_hs(struct mpii_softc *sc, struc
/*
* diskid comparison is based on the idea that all
* disks are counted by the bio(4) in sequence, thus
- * substracting the number of disks in the volume
+ * subtracting the number of disks in the volume
* from the diskid yields us a "relative" hotspare
* number, which is good enough for us.
*/
Index: src/sys/fs/udf/udf_subr.c
diff -u src/sys/fs/udf/udf_subr.c:1.174 src/sys/fs/udf/udf_subr.c:1.175
--- src/sys/fs/udf/udf_subr.c:1.174 Sat Jun 3 20:41:45 2023
+++ src/sys/fs/udf/udf_subr.c Sun Feb 4 20:50:30 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_subr.c,v 1.174 2023/06/03 20:41:45 andvar Exp $ */
+/* $NetBSD: udf_subr.c,v 1.175 2024/02/04 20:50:30 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.174 2023/06/03 20:41:45 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udf_subr.c,v 1.175 2024/02/04 20:50:30 andvar Exp $");
#endif /* not lint */
@@ -4919,7 +4919,7 @@ udf_dir_detach(struct udf_mount *ump, st
refcnt = udf_rw16(udf_node->efe->link_cnt);
}
#ifdef UDF_COMPLETE_DELETE
- /* substract reference counter in attached node */
+ /* subtract reference counter in attached node */
refcnt -= 1;
if (udf_node->fe) {
udf_node->fe->link_cnt = udf_rw16(refcnt);
@@ -4934,7 +4934,7 @@ udf_dir_detach(struct udf_mount *ump, st
if (fid->file_char & UDF_FILE_CHAR_DIR) {
int drefcnt;
- /* substract reference counter in directory node */
+ /* subtract reference counter in directory node */
/* note subtract 2 (?) for its was also backreferenced */
if (dir_node->fe) {
drefcnt = udf_rw16(dir_node->fe->link_cnt);
