Module Name: src
Committed By: andvar
Date: Tue Sep 7 13:24:46 UTC 2021
Modified Files:
src/common/lib/libprop: prop_string.c
src/sys/arch/hppa/hppa: intr.c
src/sys/arch/sparc64/sparc64: autoconf.c
src/sys/dev/audio: audio.c
src/sys/dev/sysmon: sysmon_envsys.c
src/sys/kern: sys_pipe.c
src/sys/netinet: dccp_tfrc.c sctp_output.c
Log Message:
s/aquire/acquire/ in comments, also one typo fix acqure->acquire.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/common/lib/libprop/prop_string.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/hppa/hppa/intr.c
cvs rdiff -u -r1.235 -r1.236 src/sys/arch/sparc64/sparc64/autoconf.c
cvs rdiff -u -r1.106 -r1.107 src/sys/dev/audio/audio.c
cvs rdiff -u -r1.147 -r1.148 src/sys/dev/sysmon/sysmon_envsys.c
cvs rdiff -u -r1.152 -r1.153 src/sys/kern/sys_pipe.c
cvs rdiff -u -r1.6 -r1.7 src/sys/netinet/dccp_tfrc.c
cvs rdiff -u -r1.24 -r1.25 src/sys/netinet/sctp_output.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/libprop/prop_string.c
diff -u src/common/lib/libprop/prop_string.c:1.15 src/common/lib/libprop/prop_string.c:1.16
--- src/common/lib/libprop/prop_string.c:1.15 Sat Jun 20 00:16:50 2020
+++ src/common/lib/libprop/prop_string.c Tue Sep 7 13:24:45 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: prop_string.c,v 1.15 2020/06/20 00:16:50 christos Exp $ */
+/* $NetBSD: prop_string.c,v 1.16 2021/09/07 13:24:45 andvar Exp $ */
/*-
* Copyright (c) 2006, 2020 The NetBSD Foundation, Inc.
@@ -146,7 +146,7 @@ _prop_string_free(prop_stack_t stack, pr
_PROP_MUTEX_LOCK(_prop_string_tree_mutex);
/*
* Double-check the retain count now that we've
- * acqured the tree lock; holding this lock prevents
+ * acquired the tree lock; holding this lock prevents
* new retains from coming in by finding it in the
* tree.
*/
Index: src/sys/arch/hppa/hppa/intr.c
diff -u src/sys/arch/hppa/hppa/intr.c:1.4 src/sys/arch/hppa/hppa/intr.c:1.5
--- src/sys/arch/hppa/hppa/intr.c:1.4 Thu Jul 1 22:57:45 2021
+++ src/sys/arch/hppa/hppa/intr.c Tue Sep 7 13:24:45 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.c,v 1.4 2021/07/01 22:57:45 macallan Exp $ */
+/* $NetBSD: intr.c,v 1.5 2021/09/07 13:24:45 andvar Exp $ */
/* $OpenBSD: intr.c,v 1.27 2009/12/31 12:52:35 jsing Exp $ */
/*
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.4 2021/07/01 22:57:45 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.5 2021/09/07 13:24:45 andvar Exp $");
#define __MUTEX_PRIVATE
@@ -349,7 +349,7 @@ hppa_intr(struct trapframe *frame)
/*
* If we interrupted in the middle of mutex_enter(), we must patch up
* the lock owner value quickly if we got the interlock. If any of the
- * interrupt handlers need to aquire the mutex, they could deadlock if
+ * interrupt handlers need to acquire the mutex, they could deadlock if
* the owner value is left unset.
*/
if (frame->tf_iisq_head == HPPA_SID_KERNEL &&
Index: src/sys/arch/sparc64/sparc64/autoconf.c
diff -u src/sys/arch/sparc64/sparc64/autoconf.c:1.235 src/sys/arch/sparc64/sparc64/autoconf.c:1.236
--- src/sys/arch/sparc64/sparc64/autoconf.c:1.235 Sat Aug 21 11:55:25 2021
+++ src/sys/arch/sparc64/sparc64/autoconf.c Tue Sep 7 13:24:46 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.235 2021/08/21 11:55:25 andvar Exp $ */
+/* $NetBSD: autoconf.c,v 1.236 2021/09/07 13:24:46 andvar Exp $ */
/*
* Copyright (c) 1996
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.235 2021/08/21 11:55:25 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.236 2021/09/07 13:24:46 andvar Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -1457,7 +1457,7 @@ device_register_post_config(device_t dev
/*
* If this is a FC-AL drive it will have
- * aquired its WWN device property by now,
+ * acquired its WWN device property by now,
* so we can properly match it.
*/
if (prop_dictionary_get_uint64(device_properties(dev),
Index: src/sys/dev/audio/audio.c
diff -u src/sys/dev/audio/audio.c:1.106 src/sys/dev/audio/audio.c:1.107
--- src/sys/dev/audio/audio.c:1.106 Sat Aug 7 16:19:09 2021
+++ src/sys/dev/audio/audio.c Tue Sep 7 13:24:46 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: audio.c,v 1.106 2021/08/07 16:19:09 thorpej Exp $ */
+/* $NetBSD: audio.c,v 1.107 2021/09/07 13:24:46 andvar Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -138,7 +138,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.106 2021/08/07 16:19:09 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.107 2021/09/07 13:24:46 andvar Exp $");
#ifdef _KERNEL_OPT
#include "audio.h"
@@ -1645,7 +1645,7 @@ audio_track_waitio(struct audio_softc *s
/*
* Try to acquire track lock.
- * It doesn't block if the track lock is already aquired.
+ * It doesn't block if the track lock is already acquired.
* Returns true if the track lock was acquired, or false if the track
* lock was already acquired.
*/
Index: src/sys/dev/sysmon/sysmon_envsys.c
diff -u src/sys/dev/sysmon/sysmon_envsys.c:1.147 src/sys/dev/sysmon/sysmon_envsys.c:1.148
--- src/sys/dev/sysmon/sysmon_envsys.c:1.147 Thu Jun 11 02:39:31 2020
+++ src/sys/dev/sysmon/sysmon_envsys.c Tue Sep 7 13:24:46 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon_envsys.c,v 1.147 2020/06/11 02:39:31 thorpej Exp $ */
+/* $NetBSD: sysmon_envsys.c,v 1.148 2021/09/07 13:24:46 andvar Exp $ */
/*-
* Copyright (c) 2007, 2008 Juan Romero Pardines.
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys.c,v 1.147 2020/06/11 02:39:31 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys.c,v 1.148 2021/09/07 13:24:46 andvar Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -1540,7 +1540,7 @@ bad:
* returns false). Example usage: callback selects temperature
* sensors in a given thermal zone, the function calculates the
* maximum currently reported temperature in this zone.
- * If the parameter "refresh" is true, new values will be aquired
+ * If the parameter "refresh" is true, new values will be acquired
* from the hardware, if not, the last reported value will be used.
*/
uint32_t
Index: src/sys/kern/sys_pipe.c
diff -u src/sys/kern/sys_pipe.c:1.152 src/sys/kern/sys_pipe.c:1.153
--- src/sys/kern/sys_pipe.c:1.152 Mon Jan 25 19:21:11 2021
+++ src/sys/kern/sys_pipe.c Tue Sep 7 13:24:46 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_pipe.c,v 1.152 2021/01/25 19:21:11 dholland Exp $ */
+/* $NetBSD: sys_pipe.c,v 1.153 2021/09/07 13:24:46 andvar Exp $ */
/*-
* Copyright (c) 2003, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_pipe.c,v 1.152 2021/01/25 19:21:11 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_pipe.c,v 1.153 2021/09/07 13:24:46 andvar Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -584,7 +584,7 @@ pipe_write(file_t *fp, off_t *offset, st
}
++wpipe->pipe_busy;
- /* Aquire the long-term pipe lock */
+ /* Acquire the long-term pipe lock */
if ((error = pipelock(wpipe, true)) != 0) {
--wpipe->pipe_busy;
if (wpipe->pipe_busy == 0) {
Index: src/sys/netinet/dccp_tfrc.c
diff -u src/sys/netinet/dccp_tfrc.c:1.6 src/sys/netinet/dccp_tfrc.c:1.7
--- src/sys/netinet/dccp_tfrc.c:1.6 Fri Dec 27 09:25:58 2019
+++ src/sys/netinet/dccp_tfrc.c Tue Sep 7 13:24:46 2021
@@ -1,5 +1,5 @@
/* $KAME: dccp_tfrc.c,v 1.16 2006/03/01 17:34:08 nishida Exp $ */
-/* $NetBSD: dccp_tfrc.c,v 1.6 2019/12/27 09:25:58 msaitoh Exp $ */
+/* $NetBSD: dccp_tfrc.c,v 1.7 2021/09/07 13:24:46 andvar Exp $ */
/*
* Copyright (c) 2003 Nils-Erik Mattsson
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dccp_tfrc.c,v 1.6 2019/12/27 09:25:58 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dccp_tfrc.c,v 1.7 2021/09/07 13:24:46 andvar Exp $");
#ifdef _KERNEL_OPT
#include "opt_dccp.h"
@@ -244,7 +244,7 @@ tfrc_time_send(void *ccb)
"TFRC - Callout pending. (tfrc_time_send)\n"));
return;
}
- /* aquire locks for dccp_output */
+ /* acquire locks for dccp_output */
s = splsoftnet();
INP_INFO_RLOCK(&dccpbinfo);
/*inp = cb->pcb->d_inpcb;*/
Index: src/sys/netinet/sctp_output.c
diff -u src/sys/netinet/sctp_output.c:1.24 src/sys/netinet/sctp_output.c:1.25
--- src/sys/netinet/sctp_output.c:1.24 Fri Sep 3 21:55:01 2021
+++ src/sys/netinet/sctp_output.c Tue Sep 7 13:24:46 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sctp_output.c,v 1.24 2021/09/03 21:55:01 andvar Exp $ */
+/* $NetBSD: sctp_output.c,v 1.25 2021/09/07 13:24:46 andvar Exp $ */
/* $KAME: sctp_output.c,v 1.48 2005/06/16 18:29:24 jinmei Exp $ */
/*
@@ -30,7 +30,7 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sctp_output.c,v 1.24 2021/09/03 21:55:01 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sctp_output.c,v 1.25 2021/09/07 13:24:46 andvar Exp $");
#ifdef _KERNEL_OPT
#include "opt_ipsec.h"
@@ -9413,7 +9413,7 @@ sctp_copy_it_in(struct sctp_inpcb *inp,
}
error = sblock(&so->so_snd, M_WAITOK);
if (error) {
- /* Can't aquire the lock */
+ /* Can't acquire the lock */
goto out_locked;
}
#if defined(__FreeBSD__) && __FreeBSD_version >= 502115
