Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src s/occured/occurred/ in comments, log messages and man pages.
details: https://anonhg.NetBSD.org/src/rev/3000257bdc00
branches: trunk
changeset: 1027548:3000257bdc00
user: andvar <andvar%NetBSD.org@localhost>
date: Fri Dec 10 20:36:02 2021 +0000
description:
s/occured/occurred/ in comments, log messages and man pages.
diffstat:
lib/libc/db/man/dbm_clearerr.3 | 6 +++---
lib/libc/gen/wordexp.3 | 4 ++--
lib/libc/sys/send.2 | 4 ++--
lib/libterminfo/term.h | 4 ++--
libexec/httpd/bozohttpd.c | 4 ++--
sys/arch/aarch64/aarch64/locore.S | 6 +++---
sys/arch/aarch64/aarch64/pmap.c | 6 +++---
sys/arch/arm/xscale/ixp425_qmgr.c | 6 +++---
sys/arch/ews4800mips/sbd/kbms_sbdio.c | 6 +++---
sys/arch/luna68k/stand/boot/sc.c | 4 ++--
sys/arch/mips/ingenic/ingenic_regs.h | 8 ++++----
sys/arch/sparc/dev/sxreg.h | 14 +++++++-------
sys/arch/sparc64/dev/psmreg.h | 2 +-
sys/arch/xen/xen/privcmd.c | 6 +++---
sys/compat/common/compat_50_mod.c | 6 +++---
sys/dev/audio/audio.c | 6 +++---
sys/dev/hil/hil.c | 4 ++--
sys/dev/ic/aacreg.h | 4 ++--
sys/dev/ic/sl811hs.c | 6 +++---
sys/dev/marvell/mvxpsec.c | 4 ++--
sys/dev/pci/cxgb/cxgb_t3_hw.c | 4 ++--
sys/dev/pci/twa.c | 6 +++---
sys/dev/raidframe/rf_reconstruct.h | 4 ++--
sys/fs/efs/efs_subr.c | 6 +++---
sys/kern/subr_interrupt.c | 6 +++---
sys/kern/sys_select.c | 10 +++++-----
sys/netinet/dccp_tfrc.c | 6 +++---
sys/netinet/sctp_pcb.c | 6 +++---
sys/sys/timex.h | 4 ++--
sys/ufs/chfs/chfs_readinode.c | 4 ++--
tests/dev/audio/audiotest.c | 6 +++---
tests/lib/libc/gen/t_siginfo.c | 4 ++--
32 files changed, 88 insertions(+), 88 deletions(-)
diffs (truncated from 766 to 300 lines):
diff -r 67b46e5dbe2f -r 3000257bdc00 lib/libc/db/man/dbm_clearerr.3
--- a/lib/libc/db/man/dbm_clearerr.3 Fri Dec 10 20:22:54 2021 +0000
+++ b/lib/libc/db/man/dbm_clearerr.3 Fri Dec 10 20:36:02 2021 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: dbm_clearerr.3,v 1.6 2019/05/26 06:18:13 abhinav Exp $
+.\" $NetBSD: dbm_clearerr.3,v 1.7 2021/12/10 20:36:02 andvar Exp $
.\"
.\" Copyright (c) 2004 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -236,7 +236,7 @@
.Fa datum ;
if no record matching
.Fa key
-was found or if an error occured, its
+was found or if an error occurred, its
.Fa dptr
member is a null pointer.
.Pp
@@ -263,7 +263,7 @@
.Fn dbm_nextkey
functions return a key
.Fa datum .
-When the end of the database is reached or if an error occured, its
+When the end of the database is reached or if an error occurred, its
.Fa dptr
member is a null pointer.
.Pp
diff -r 67b46e5dbe2f -r 3000257bdc00 lib/libc/gen/wordexp.3
--- a/lib/libc/gen/wordexp.3 Fri Dec 10 20:22:54 2021 +0000
+++ b/lib/libc/gen/wordexp.3 Fri Dec 10 20:36:02 2021 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: wordexp.3,v 1.3 2017/07/03 21:32:49 wiz Exp $
+.\" $NetBSD: wordexp.3,v 1.4 2021/12/10 20:36:02 andvar Exp $
.\"
.\" Copyright (c) 2002 Tim J. Robbins
.\" All rights reserved.
@@ -163,7 +163,7 @@
Shell syntax error in
.Fa words .
.It Dv WRDE_ERRNO
-An internal error occured and
+An internal error occurred and
.Va errno
is set to indicate the error.
.El
diff -r 67b46e5dbe2f -r 3000257bdc00 lib/libc/sys/send.2
--- a/lib/libc/sys/send.2 Fri Dec 10 20:22:54 2021 +0000
+++ b/lib/libc/sys/send.2 Fri Dec 10 20:36:02 2021 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: send.2,v 1.33 2021/03/28 03:29:31 dholland Exp $
+.\" $NetBSD: send.2,v 1.34 2021/12/10 20:36:02 andvar Exp $
.\"
.\" Copyright (c) 1983, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -186,7 +186,7 @@
The
.Fn sendmmsg
call returns the number of messages sent, or \-1
-if an error occured.
+if an error occurred.
.Sh ERRORS
.Fn send ,
.Fn sendto ,
diff -r 67b46e5dbe2f -r 3000257bdc00 lib/libterminfo/term.h
--- a/lib/libterminfo/term.h Fri Dec 10 20:22:54 2021 +0000
+++ b/lib/libterminfo/term.h Fri Dec 10 20:36:02 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: term.h,v 1.24 2020/06/05 22:08:10 roy Exp $ */
+/* $NetBSD: term.h,v 1.25 2021/12/10 20:36:02 andvar Exp $ */
/*
* Copyright (c) 2009, 2010, 2011, 2013, 2020 The NetBSD Foundation, Inc.
@@ -1749,7 +1749,7 @@
* key_ll: sent by home-down key
* key_mark: sent by mark key
* key_message: sent by message key
- * key_mouse: 0631, Mouse event has occured
+ * key_mouse: 0631, Mouse event has occurred
* key_move: sent by move key
* key_next: sent by next-object key
* key_npage: sent by next-page key
diff -r 67b46e5dbe2f -r 3000257bdc00 libexec/httpd/bozohttpd.c
--- a/libexec/httpd/bozohttpd.c Fri Dec 10 20:22:54 2021 +0000
+++ b/libexec/httpd/bozohttpd.c Fri Dec 10 20:36:02 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bozohttpd.c,v 1.136 2021/08/24 09:47:36 mrg Exp $ */
+/* $NetBSD: bozohttpd.c,v 1.137 2021/12/10 20:36:02 andvar Exp $ */
/* $eterna: bozohttpd.c,v 1.178 2011/11/18 09:21:15 mrg Exp $ */
@@ -2164,7 +2164,7 @@
{ 413, "413 Payload Too Large", "Use smaller requests", },
{ 417, "417 Expectation Failed","Expectations not available", },
{ 420, "420 Enhance Your Calm","Chill, Winston", },
- { 500, "500 Internal Error", "An error occured on the server", },
+ { 500, "500 Internal Error", "An error occurred on the server", },
{ 501, "501 Not Implemented", "This request is not available", },
{ 0, NULL, NULL, },
};
diff -r 67b46e5dbe2f -r 3000257bdc00 sys/arch/aarch64/aarch64/locore.S
--- a/sys/arch/aarch64/aarch64/locore.S Fri Dec 10 20:22:54 2021 +0000
+++ b/sys/arch/aarch64/aarch64/locore.S Fri Dec 10 20:36:02 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.83 2021/11/14 16:56:32 riastradh Exp $ */
+/* $NetBSD: locore.S,v 1.84 2021/12/10 20:36:02 andvar Exp $ */
/*
* Copyright (c) 2017 Ryo Shimizu <ryo%nerv.org@localhost>
@@ -38,7 +38,7 @@
#include <aarch64/hypervisor.h>
#include "assym.h"
-RCSID("$NetBSD: locore.S,v 1.83 2021/11/14 16:56:32 riastradh Exp $")
+RCSID("$NetBSD: locore.S,v 1.84 2021/12/10 20:36:02 andvar Exp $")
#ifdef AARCH64_DEVICE_MEM_STRONGLY_ORDERED
#define MAIR_DEVICE_MEM MAIR_DEVICE_nGnRnE
@@ -148,7 +148,7 @@
br x20 /* jump to the kernel virtual address */
aarch64_fatal:
- PRINT("fatal error occured while booting\n")
+ PRINT("fatal error occurred while booting\n")
/* return to bootloader. if switched from EL2 to EL1, It might fail */
mov lr, x27
mov sp, x28
diff -r 67b46e5dbe2f -r 3000257bdc00 sys/arch/aarch64/aarch64/pmap.c
--- a/sys/arch/aarch64/aarch64/pmap.c Fri Dec 10 20:22:54 2021 +0000
+++ b/sys/arch/aarch64/aarch64/pmap.c Fri Dec 10 20:36:02 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.120 2021/12/07 21:37:36 andvar Exp $ */
+/* $NetBSD: pmap.c,v 1.121 2021/12/10 20:36:02 andvar Exp $ */
/*
* Copyright (c) 2017 Ryo Shimizu <ryo%nerv.org@localhost>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.120 2021/12/07 21:37:36 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.121 2021/12/10 20:36:02 andvar Exp $");
#include "opt_arm_debug.h"
#include "opt_ddb.h"
@@ -2495,7 +2495,7 @@
goto done;
}
- /* pte is readable and writable, but occured fault? probably copy(9) */
+ /* pte is readable and writable, but occurred fault? probably copy(9) */
if ((pte & LX_BLKPAG_AF) && ((pte & LX_BLKPAG_AP) == LX_BLKPAG_AP_RW))
goto done;
diff -r 67b46e5dbe2f -r 3000257bdc00 sys/arch/arm/xscale/ixp425_qmgr.c
--- a/sys/arch/arm/xscale/ixp425_qmgr.c Fri Dec 10 20:22:54 2021 +0000
+++ b/sys/arch/arm/xscale/ixp425_qmgr.c Fri Dec 10 20:36:02 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ixp425_qmgr.c,v 1.10 2019/12/27 09:25:57 msaitoh Exp $ */
+/* $NetBSD: ixp425_qmgr.c,v 1.11 2021/12/10 20:36:02 andvar Exp $ */
/*-
* Copyright (c) 2006 Sam Leffler, Errno Consulting
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
/*__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_qmgr.c,v 1.1 2006/11/19 23:55:23 sam Exp $");*/
-__KERNEL_RCSID(0, "$NetBSD: ixp425_qmgr.c,v 1.10 2019/12/27 09:25:57 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixp425_qmgr.c,v 1.11 2021/12/10 20:36:02 andvar Exp $");
/*
* Intel XScale Queue Manager support.
@@ -436,7 +436,7 @@
return ENOSPC;
}
/*
- * No overflow occured : someone is draining the queue
+ * No overflow occurred : someone is draining the queue
* and the current counter needs to be
* updated from the current number of entries in the queue
*/
diff -r 67b46e5dbe2f -r 3000257bdc00 sys/arch/ews4800mips/sbd/kbms_sbdio.c
--- a/sys/arch/ews4800mips/sbd/kbms_sbdio.c Fri Dec 10 20:22:54 2021 +0000
+++ b/sys/arch/ews4800mips/sbd/kbms_sbdio.c Fri Dec 10 20:36:02 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: kbms_sbdio.c,v 1.14 2021/09/18 15:14:40 tsutsui Exp $ */
+/* $NetBSD: kbms_sbdio.c,v 1.15 2021/12/10 20:36:02 andvar Exp $ */
/*-
* Copyright (c) 2004, 2005 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kbms_sbdio.c,v 1.14 2021/09/18 15:14:40 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kbms_sbdio.c,v 1.15 2021/12/10 20:36:02 andvar Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -203,7 +203,7 @@
*reg->mouse_csr = 1;
if (((v = *reg->mouse_csr) &
(ZSRR1_FE | ZSRR1_DO | ZSRR1_PE)) != 0) {
- /* Error occured. re-initialize */
+ /* Error occurred. re-initialize */
printf("initialize mouse. error=%02x\n", v);
mouse_init(sc);
} else {
diff -r 67b46e5dbe2f -r 3000257bdc00 sys/arch/luna68k/stand/boot/sc.c
--- a/sys/arch/luna68k/stand/boot/sc.c Fri Dec 10 20:22:54 2021 +0000
+++ b/sys/arch/luna68k/stand/boot/sc.c Fri Dec 10 20:36:02 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sc.c,v 1.18 2021/06/15 17:16:16 tsutsui Exp $ */
+/* $NetBSD: sc.c,v 1.19 2021/12/10 20:36:02 andvar Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -651,7 +651,7 @@
goto get_intr;
}
- /* Unknown Interrupt occured */
+ /* Unknown interrupt occurred */
return -1;
diff -r 67b46e5dbe2f -r 3000257bdc00 sys/arch/mips/ingenic/ingenic_regs.h
--- a/sys/arch/mips/ingenic/ingenic_regs.h Fri Dec 10 20:22:54 2021 +0000
+++ b/sys/arch/mips/ingenic/ingenic_regs.h Fri Dec 10 20:36:02 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ingenic_regs.h,v 1.26 2020/08/09 07:08:29 skrll Exp $ */
+/* $NetBSD: ingenic_regs.h,v 1.27 2021/12/10 20:36:03 andvar Exp $ */
/*-
* Copyright (c) 2014 Michael Lorenz
@@ -536,9 +536,9 @@
#define JZ_SMBFHCNT 0x1C /* Fast speed SMB SCL high count */
#define JZ_SMBFLCNT 0x20 /* Fast speed SMB SCL low count */
#define JZ_SMBINTST 0x2C /* SMB Interrupt Status */
- #define JZ_ISTT 0x400 /* START or RESTART occured */
- #define JZ_ISTP 0x200 /* STOP occured */
- #define JZ_TXABT 0x40 /* ABORT occured */
+ #define JZ_ISTT 0x400 /* START or RESTART occurred */
+ #define JZ_ISTP 0x200 /* STOP occurred */
+ #define JZ_TXABT 0x40 /* ABORT occurred */
#define JZ_TXEMP 0x10 /* TX FIFO is low */
#define JZ_TXOF 0x08 /* TX FIFO is high */
#define JZ_RXFL 0x04 /* RX FIFO is at JZ_SMBRXTL*/
diff -r 67b46e5dbe2f -r 3000257bdc00 sys/arch/sparc/dev/sxreg.h
--- a/sys/arch/sparc/dev/sxreg.h Fri Dec 10 20:22:54 2021 +0000
+++ b/sys/arch/sparc/dev/sxreg.h Fri Dec 10 20:36:02 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sxreg.h,v 1.20 2021/12/08 17:03:38 macallan Exp $ */
+/* $NetBSD: sxreg.h,v 1.21 2021/12/10 20:36:03 andvar Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -82,13 +82,13 @@
*/
#if 0
#define SX_PB 0x00001000 /* enable page bound checking */
-#define SX_WO 0x00002000 /* write occured ( by SX ) */
+#define SX_WO 0x00002000 /* write occurred ( by SX ) */
#define SX_GO 0x00004000 /* start/stop the processor */
#define SX_MT 0x00008000 /* instruction queue is empty */
#endif
#define SX_PB 0x00000400 /* enable page bound checking */
-#define SX_WO 0x00000800 /* write occured ( by SX ) */
+#define SX_WO 0x00000800 /* write occurred ( by SX ) */
#define SX_GO 0x00001000 /* start/stop the processor */
#define SX_JB 0x00002000 /* Jammed/Busy specifies the type of events */
/* which increment the SX timer */
@@ -98,16 +98,16 @@
/* instruction is pending in the Q */
#define SX_B0MOD 0x00010000 /* When set by SX it indicates that a write */
/* to bank zero of the SX registers (0-31) */
- /* occured */
+ /* occurred */
#define SX_B1MOD 0x00020000 /* When set by SX it indicates that a write */
/* to bank 1 of the SX registers (32-63) */
- /* occured */
+ /* occurred */
#define SX_B2MOD 0x00040000 /* When set by SX it indicates that a write */
/* to bank 2 of the SX registers (64-95) */
- /* occured */
+ /* occurred */
#define SX_B3MOD 0x00080000 /* When set by SX it indicates that a write */
/* to bank 3 of the SX registers (96-127) */
- /* occured */
+ /* occurred */
/* SX_ERROR */
#define SX_SE1 0x00000001 /* illegal instruction */
diff -r 67b46e5dbe2f -r 3000257bdc00 sys/arch/sparc64/dev/psmreg.h
--- a/sys/arch/sparc64/dev/psmreg.h Fri Dec 10 20:22:54 2021 +0000
+++ b/sys/arch/sparc64/dev/psmreg.h Fri Dec 10 20:36:02 2021 +0000
@@ -71,7 +71,7 @@
#define PSM_STAT_OVT 0x02 /* Over temperature condition */
#define PSM_STAT_UN1 0x04 /* Unused */
#define PSM_STAT_UN2 0x08 /* Unused */
Home |
Main Index |
Thread Index |
Old Index