Module Name: src
Committed By: andvar
Date: Sun May 15 20:37:51 UTC 2022
Modified Files:
src/lib/libc/gen: randomid.c
src/sbin/newfs_udf: udf_core.c
src/sys/arch/acorn32/acorn32: rpc_machdep.c
src/sys/arch/acorn32/eb7500atx: eb7500atx_machdep.c
src/sys/arch/atari/dev: fd.c
src/sys/fs/udf: udf_subr.c
src/usr.sbin/syslogd: tls.c
Log Message:
s/wich/which in comments.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/lib/libc/gen/randomid.c
cvs rdiff -u -r1.10 -r1.11 src/sbin/newfs_udf/udf_core.c
cvs rdiff -u -r1.100 -r1.101 src/sys/arch/acorn32/acorn32/rpc_machdep.c
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c
cvs rdiff -u -r1.91 -r1.92 src/sys/arch/atari/dev/fd.c
cvs rdiff -u -r1.169 -r1.170 src/sys/fs/udf/udf_subr.c
cvs rdiff -u -r1.19 -r1.20 src/usr.sbin/syslogd/tls.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/gen/randomid.c
diff -u src/lib/libc/gen/randomid.c:1.15 src/lib/libc/gen/randomid.c:1.16
--- src/lib/libc/gen/randomid.c:1.15 Sat Sep 11 20:28:03 2021
+++ src/lib/libc/gen/randomid.c Sun May 15 20:37:50 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: randomid.c,v 1.15 2021/09/11 20:28:03 andvar Exp $ */
+/* $NetBSD: randomid.c,v 1.16 2022/05/15 20:37:50 andvar Exp $ */
/* $KAME: ip6_id.c,v 1.8 2003/09/06 13:41:06 itojun Exp $ */
/* $OpenBSD: ip_id.c,v 1.6 2002/03/15 18:19:52 millert Exp $ */
@@ -83,7 +83,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: randomid.c,v 1.15 2021/09/11 20:28:03 andvar Exp $");
+__RCSID("$NetBSD: randomid.c,v 1.16 2022/05/15 20:37:50 andvar Exp $");
#endif
#include "namespace.h"
@@ -122,7 +122,7 @@ struct randomid_ctx {
#define ru_m ru_conf->rc_m
#define ru_pfacts ru_conf->rc_pfacts
#define ru_skip ru_conf->rc_skip
- long ru_out; /* Time after wich will be reseeded */
+ long ru_out; /* Time after which will be reseeded */
u_int32_t ru_counter;
u_int32_t ru_msb;
Index: src/sbin/newfs_udf/udf_core.c
diff -u src/sbin/newfs_udf/udf_core.c:1.10 src/sbin/newfs_udf/udf_core.c:1.11
--- src/sbin/newfs_udf/udf_core.c:1.10 Sat May 7 08:51:32 2022
+++ src/sbin/newfs_udf/udf_core.c Sun May 15 20:37:50 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_core.c,v 1.10 2022/05/07 08:51:32 reinoud Exp $ */
+/* $NetBSD: udf_core.c,v 1.11 2022/05/15 20:37:50 andvar Exp $ */
/*
* Copyright (c) 2006, 2008, 2021, 2022 Reinoud Zandijk
@@ -30,7 +30,7 @@
#endif
#include <sys/cdefs.h>
-__RCSID("$NetBSD: udf_core.c,v 1.10 2022/05/07 08:51:32 reinoud Exp $");
+__RCSID("$NetBSD: udf_core.c,v 1.11 2022/05/15 20:37:50 andvar Exp $");
#include <stdio.h>
#include <stdlib.h>
@@ -2435,7 +2435,7 @@ udf_create_new_fe(struct file_entry **fe
icb = &fe->icbtag;
/*
- * Always use strategy type 4 unless on WORM wich we don't support
+ * Always use strategy type 4 unless on WORM which we don't support
* (yet). Fill in defaults and set for internal allocation of data.
*/
icb->strat_type = udf_rw16(4);
@@ -2535,7 +2535,7 @@ udf_create_new_efe(struct extfile_entry
icb = &efe->icbtag;
/*
- * Always use strategy type 4 unless on WORM wich we don't support
+ * Always use strategy type 4 unless on WORM which we don't support
* (yet). Fill in defaults and set for internal allocation of data.
*/
icb->strat_type = udf_rw16(4);
Index: src/sys/arch/acorn32/acorn32/rpc_machdep.c
diff -u src/sys/arch/acorn32/acorn32/rpc_machdep.c:1.100 src/sys/arch/acorn32/acorn32/rpc_machdep.c:1.101
--- src/sys/arch/acorn32/acorn32/rpc_machdep.c:1.100 Thu Sep 16 20:17:46 2021
+++ src/sys/arch/acorn32/acorn32/rpc_machdep.c Sun May 15 20:37:50 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: rpc_machdep.c,v 1.100 2021/09/16 20:17:46 andvar Exp $ */
+/* $NetBSD: rpc_machdep.c,v 1.101 2022/05/15 20:37:50 andvar Exp $ */
/*
* Copyright (c) 2000-2002 Reinoud Zandijk.
@@ -54,7 +54,7 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: rpc_machdep.c,v 1.100 2021/09/16 20:17:46 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rpc_machdep.c,v 1.101 2022/05/15 20:37:50 andvar Exp $");
#include <sys/systm.h>
#include <sys/kernel.h>
@@ -457,7 +457,7 @@ initarm(void *cookie)
* virtual address == physical address apart from the areas:
* 0x00000000 -> 0x000fffff which is mapped to
* top 1MB of physical memory
- * 0xf0000000 -> 0xf0ffffff wich is mapped to
+ * 0xf0000000 -> 0xf0ffffff which is mapped to
* physical address 0x10000000 -> 0x10ffffff
* or on a Kinetic:
* physical address 0x20400000 -> 0x20ffffff
Index: src/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c
diff -u src/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c:1.36 src/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c:1.37
--- src/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c:1.36 Thu Sep 16 20:17:46 2021
+++ src/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c Sun May 15 20:37:51 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: eb7500atx_machdep.c,v 1.36 2021/09/16 20:17:46 andvar Exp $ */
+/* $NetBSD: eb7500atx_machdep.c,v 1.37 2022/05/15 20:37:51 andvar Exp $ */
/*
* Copyright (c) 2000-2002 Reinoud Zandijk.
@@ -54,7 +54,7 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: eb7500atx_machdep.c,v 1.36 2021/09/16 20:17:46 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: eb7500atx_machdep.c,v 1.37 2022/05/15 20:37:51 andvar Exp $");
#include <sys/systm.h>
#include <sys/kernel.h>
@@ -422,7 +422,7 @@ initarm(void *cookie)
* virtual address == physical address apart from the areas:
* 0x00000000 -> 0x000fffff which is mapped to
* top 1MB of physical memory
- * 0xf0000000 -> 0xf0ffffff wich is mapped to
+ * 0xf0000000 -> 0xf0ffffff which is mapped to
* physical address 0x01000000 -> 0x01ffffff (DRAM0a, dram[0])
*
* This means that the kernel is mapped suitably for continuing
Index: src/sys/arch/atari/dev/fd.c
diff -u src/sys/arch/atari/dev/fd.c:1.91 src/sys/arch/atari/dev/fd.c:1.92
--- src/sys/arch/atari/dev/fd.c:1.91 Tue May 3 20:52:31 2022
+++ src/sys/arch/atari/dev/fd.c Sun May 15 20:37:51 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.91 2022/05/03 20:52:31 andvar Exp $ */
+/* $NetBSD: fd.c,v 1.92 2022/05/15 20:37:51 andvar Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman.
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.91 2022/05/03 20:52:31 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.92 2022/05/15 20:37:51 andvar Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1255,7 +1255,7 @@ fdmoff(struct fd_softc *fdsoftc)
}
/*
- * Used to find out wich drives are actually connected. We do this by issuing
+ * Used to find out which drives are actually connected. We do this by issuing
* is 'RESTORE' command and check if the 'track-0' bit is set. This also works
* if the drive is present but no floppy is inserted.
*/
Index: src/sys/fs/udf/udf_subr.c
diff -u src/sys/fs/udf/udf_subr.c:1.169 src/sys/fs/udf/udf_subr.c:1.170
--- src/sys/fs/udf/udf_subr.c:1.169 Fri Apr 22 21:21:10 2022
+++ src/sys/fs/udf/udf_subr.c Sun May 15 20:37:51 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_subr.c,v 1.169 2022/04/22 21:21:10 reinoud Exp $ */
+/* $NetBSD: udf_subr.c,v 1.170 2022/05/15 20:37:51 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.169 2022/04/22 21:21:10 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udf_subr.c,v 1.170 2022/05/15 20:37:51 andvar Exp $");
#endif /* not lint */
@@ -4683,7 +4683,7 @@ udf_create_new_fe(struct udf_mount *ump,
icb = &fe->icbtag;
/*
- * Always use strategy type 4 unless on WORM wich we don't support
+ * Always use strategy type 4 unless on WORM which we don't support
* (yet). Fill in defaults and set for internal allocation of data.
*/
icb->strat_type = udf_rw16(4);
@@ -4765,7 +4765,7 @@ udf_create_new_efe(struct udf_mount *ump
icb = &efe->icbtag;
/*
- * Always use strategy type 4 unless on WORM wich we don't support
+ * Always use strategy type 4 unless on WORM which we don't support
* (yet). Fill in defaults and set for internal allocation of data.
*/
icb->strat_type = udf_rw16(4);
Index: src/usr.sbin/syslogd/tls.c
diff -u src/usr.sbin/syslogd/tls.c:1.19 src/usr.sbin/syslogd/tls.c:1.20
--- src/usr.sbin/syslogd/tls.c:1.19 Sat Nov 27 22:30:26 2021
+++ src/usr.sbin/syslogd/tls.c Sun May 15 20:37:51 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: tls.c,v 1.19 2021/11/27 22:30:26 rillig Exp $ */
+/* $NetBSD: tls.c,v 1.20 2022/05/15 20:37:51 andvar Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: tls.c,v 1.19 2021/11/27 22:30:26 rillig Exp $");
+__RCSID("$NetBSD: tls.c,v 1.20 2022/05/15 20:37:51 andvar Exp $");
#ifndef DISABLE_TLS
#include <sys/stat.h>
@@ -336,7 +336,7 @@ get_fingerprint(const X509 *cert, char *
*
* Intended behaviour is to prefer the IANA names,
* but allow the user to use OpenSSL names as well
- * (e.g. for "RIPEMD160" wich has no IANA name)
+ * (e.g. for "RIPEMD160" which has no IANA name)
*/
static const struct hash_alg_namemap {
const char *iana;
