Module Name: src
Committed By: kamil
Date: Thu Nov 3 22:08:31 UTC 2016
Modified Files:
src/sys/arch/amiga/dev: grf_ul.c
src/sys/arch/sgimips/sgimips: machdep.c
src/sys/kern: kern_exec.c
src/tests/lib/libc/gen: t_raise.c
src/usr.bin/xlint/lint1: decl.c
Log Message:
Prefer modern simple past tense and past participle of catch
The "catched" form is obsolete and nonstandard, prefer "caught".
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/amiga/dev/grf_ul.c
cvs rdiff -u -r1.141 -r1.142 src/sys/arch/sgimips/sgimips/machdep.c
cvs rdiff -u -r1.437 -r1.438 src/sys/kern/kern_exec.c
cvs rdiff -u -r1.5 -r1.6 src/tests/lib/libc/gen/t_raise.c
cvs rdiff -u -r1.65 -r1.66 src/usr.bin/xlint/lint1/decl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amiga/dev/grf_ul.c
diff -u src/sys/arch/amiga/dev/grf_ul.c:1.50 src/sys/arch/amiga/dev/grf_ul.c:1.51
--- src/sys/arch/amiga/dev/grf_ul.c:1.50 Wed Jan 22 00:25:16 2014
+++ src/sys/arch/amiga/dev/grf_ul.c Thu Nov 3 22:08:31 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: grf_ul.c,v 1.50 2014/01/22 00:25:16 christos Exp $ */
+/* $NetBSD: grf_ul.c,v 1.51 2016/11/03 22:08:31 kamil Exp $ */
#define UL_DEBUG
/*-
@@ -33,7 +33,7 @@
#include "opt_amigacons.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grf_ul.c,v 1.50 2014/01/22 00:25:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf_ul.c,v 1.51 2016/11/03 22:08:31 kamil Exp $");
#include "grful.h"
#include "ite.h"
@@ -522,7 +522,7 @@ grfulattach(device_t parent, device_t se
gup->gus_isr.isr_intr = ulisr;
gup->gus_isr.isr_arg = (void *)gp;
/*
- * To make sure ints are always catched, first add new isr
+ * To make sure ints are always caught, first add new isr
* then remove old:
*/
add_isr(&gup->gus_isr);
Index: src/sys/arch/sgimips/sgimips/machdep.c
diff -u src/sys/arch/sgimips/sgimips/machdep.c:1.141 src/sys/arch/sgimips/sgimips/machdep.c:1.142
--- src/sys/arch/sgimips/sgimips/machdep.c:1.141 Fri Jun 26 22:55:06 2015
+++ src/sys/arch/sgimips/sgimips/machdep.c Thu Nov 3 22:08:31 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.141 2015/06/26 22:55:06 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.142 2016/11/03 22:08:31 kamil Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.141 2015/06/26 22:55:06 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.142 2016/11/03 22:08:31 kamil Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -394,7 +394,7 @@ mach_init(int argc, int32_t argv32[], ui
/*
* The case where the kernel has been loaded by a
- * boot loader will usually have been catched by
+ * boot loader will usually have been caught by
* the first makebootdev() case earlier on, but
* we still use OSLoadPartition to get the preferred
* root filesystem location, even if it's not
Index: src/sys/kern/kern_exec.c
diff -u src/sys/kern/kern_exec.c:1.437 src/sys/kern/kern_exec.c:1.438
--- src/sys/kern/kern_exec.c:1.437 Thu Sep 15 17:44:16 2016
+++ src/sys/kern/kern_exec.c Thu Nov 3 22:08:30 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_exec.c,v 1.437 2016/09/15 17:44:16 christos Exp $ */
+/* $NetBSD: kern_exec.c,v 1.438 2016/11/03 22:08:30 kamil Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.437 2016/09/15 17:44:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.438 2016/11/03 22:08:30 kamil Exp $");
#include "opt_exec.h"
#include "opt_execfmt.h"
@@ -1213,7 +1213,7 @@ execve_runproc(struct lwp *l, struct exe
if (__predict_false(ktrace_on))
fd_ktrexecfd();
- execsigs(p); /* reset catched signals */
+ execsigs(p); /* reset caught signals */
mutex_enter(p->p_lock);
l->l_ctxlink = NULL; /* reset ucontext link */
Index: src/tests/lib/libc/gen/t_raise.c
diff -u src/tests/lib/libc/gen/t_raise.c:1.5 src/tests/lib/libc/gen/t_raise.c:1.6
--- src/tests/lib/libc/gen/t_raise.c:1.5 Tue May 10 12:43:42 2011
+++ src/tests/lib/libc/gen/t_raise.c Thu Nov 3 22:08:31 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: t_raise.c,v 1.5 2011/05/10 12:43:42 jruoho Exp $ */
+/* $NetBSD: t_raise.c,v 1.6 2016/11/03 22:08:31 kamil Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_raise.c,v 1.5 2011/05/10 12:43:42 jruoho Exp $");
+__RCSID("$NetBSD: t_raise.c,v 1.6 2016/11/03 22:08:31 kamil Exp $");
#include <atf-c.h>
@@ -176,7 +176,7 @@ ATF_TC_BODY(raise_stress, tc)
(void)raise(SIGUSR1);
if (count != maxiter)
- atf_tc_fail("not all signals were catched");
+ atf_tc_fail("not all signals were caught");
}
ATF_TP_ADD_TCS(tp)
Index: src/usr.bin/xlint/lint1/decl.c
diff -u src/usr.bin/xlint/lint1/decl.c:1.65 src/usr.bin/xlint/lint1/decl.c:1.66
--- src/usr.bin/xlint/lint1/decl.c:1.65 Tue Aug 23 16:42:55 2016
+++ src/usr.bin/xlint/lint1/decl.c Thu Nov 3 22:08:30 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: decl.c,v 1.65 2016/08/23 16:42:55 christos Exp $ */
+/* $NetBSD: decl.c,v 1.66 2016/11/03 22:08:30 kamil Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -38,7 +38,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: decl.c,v 1.65 2016/08/23 16:42:55 christos Exp $");
+__RCSID("$NetBSD: decl.c,v 1.66 2016/11/03 22:08:30 kamil Exp $");
#endif
#include <sys/param.h>
@@ -2035,7 +2035,7 @@ isredec(sym_t *dsym, int *dowarn)
return(0);
if (rsym->s_scl == EXTERN && rsym->s_def == DEF) {
/*
- * All cases except "int a = 1; static int a;" are catched
+ * All cases except "int a = 1; static int a;" are caught
* above with or without a warning
*/
/* redeclaration of %s */
