Module Name: src
Committed By: andvar
Date: Sat Feb 10 08:24:51 UTC 2024
Modified Files:
src/games/trek: trek.h
src/sbin/restore: symtab.c
src/sys/arch/arm/gemini: gemini_ipmvar.h
src/sys/arch/hp300/dev: rdreg.h
src/sys/arch/mac68k/mac68k: machdep.c
src/sys/arch/sparc/sparc: locore.s
src/sys/dev/gpib: rdreg.h
src/sys/dev/ic: hd64570.c
src/sys/dev/mscp: mscp_subr.c
Log Message:
s/indicies/indices/ in comments.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/games/trek/trek.h
cvs rdiff -u -r1.30 -r1.31 src/sbin/restore/symtab.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/gemini/gemini_ipmvar.h
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/hp300/dev/rdreg.h
cvs rdiff -u -r1.366 -r1.367 src/sys/arch/mac68k/mac68k/machdep.c
cvs rdiff -u -r1.284 -r1.285 src/sys/arch/sparc/sparc/locore.s
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/gpib/rdreg.h
cvs rdiff -u -r1.57 -r1.58 src/sys/dev/ic/hd64570.c
cvs rdiff -u -r1.48 -r1.49 src/sys/dev/mscp/mscp_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/games/trek/trek.h
diff -u src/games/trek/trek.h:1.18 src/games/trek/trek.h:1.19
--- src/games/trek/trek.h:1.18 Wed Aug 12 08:54:54 2009
+++ src/games/trek/trek.h Sat Feb 10 08:24:50 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: trek.h,v 1.18 2009/08/12 08:54:54 dholland Exp $ */
+/* $NetBSD: trek.h,v 1.19 2024/02/10 08:24:50 andvar Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -337,7 +337,7 @@ extern struct Etc_struct Etc;
* scheduled event of each type. Zero if no such event scheduled.
*/
-/* Klingon move indicies */
+/* Klingon move indices */
#define KM_OB 0 /* Old quadrant, Before attack */
#define KM_OA 1 /* Old quadrant, After attack */
#define KM_EB 2 /* Enter quadrant, Before attack */
Index: src/sbin/restore/symtab.c
diff -u src/sbin/restore/symtab.c:1.30 src/sbin/restore/symtab.c:1.31
--- src/sbin/restore/symtab.c:1.30 Sat Jun 19 13:56:35 2021
+++ src/sbin/restore/symtab.c Sat Feb 10 08:24:50 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: symtab.c,v 1.30 2021/06/19 13:56:35 christos Exp $ */
+/* $NetBSD: symtab.c,v 1.31 2024/02/10 08:24:50 andvar Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)symtab.c 8.3 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: symtab.c,v 1.30 2021/06/19 13:56:35 christos Exp $");
+__RCSID("$NetBSD: symtab.c,v 1.31 2024/02/10 08:24:50 andvar Exp $");
#endif
#endif /* not lint */
@@ -466,7 +466,7 @@ dumpsymtable(const char *filename, int32
}
clearerr(fd);
/*
- * Assign indicies to each entry
+ * Assign indices to each entry
* Write out the string entries
*/
for (i = UFS_WINO; i <= maxino; i++) {
Index: src/sys/arch/arm/gemini/gemini_ipmvar.h
diff -u src/sys/arch/arm/gemini/gemini_ipmvar.h:1.1 src/sys/arch/arm/gemini/gemini_ipmvar.h:1.2
--- src/sys/arch/arm/gemini/gemini_ipmvar.h:1.1 Sat Dec 6 05:22:39 2008
+++ src/sys/arch/arm/gemini/gemini_ipmvar.h Sat Feb 10 08:24:50 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: gemini_ipmvar.h,v 1.1 2008/12/06 05:22:39 cliff Exp $ */
+/* $NetBSD: gemini_ipmvar.h,v 1.2 2024/02/10 08:24:50 andvar Exp $ */
#ifndef _GEMINI_IPMVAR_H_
#define _GEMINI_IPMVAR_H_
@@ -9,7 +9,7 @@
* - the queue gets located in memory shared between cores
* - is mapped non-cached so SW coherency is not required.
* - be sure ipm_queue_t starts on 32 bit (min) boundary to align descriptors
- * - note that indicies are 8 bit and NIPMDESC < (1<<8)
+ * - note that indices are 8 bit and NIPMDESC < (1<<8)
* be sure to adjust typedef if size is increased
* - current sizes, typedef, and padding make sizeof(ipm_queue_t) == 4096
*/
Index: src/sys/arch/hp300/dev/rdreg.h
diff -u src/sys/arch/hp300/dev/rdreg.h:1.20 src/sys/arch/hp300/dev/rdreg.h:1.21
--- src/sys/arch/hp300/dev/rdreg.h:1.20 Fri Nov 25 13:02:51 2022
+++ src/sys/arch/hp300/dev/rdreg.h Sat Feb 10 08:24:50 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: rdreg.h,v 1.20 2022/11/25 13:02:51 tsutsui Exp $ */
+/* $NetBSD: rdreg.h,v 1.21 2024/02/10 08:24:50 andvar Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -150,7 +150,7 @@ struct rd_clearcmd {
#define RDNAMELEN 6
-/* SW ids -- indicies into rdidentinfo, order is arbitrary */
+/* SW ids -- indices into rdidentinfo, order is arbitrary */
#define RD7945A 0
#define RD9134D 1
#define RD9122S 2
Index: src/sys/arch/mac68k/mac68k/machdep.c
diff -u src/sys/arch/mac68k/mac68k/machdep.c:1.366 src/sys/arch/mac68k/mac68k/machdep.c:1.367
--- src/sys/arch/mac68k/mac68k/machdep.c:1.366 Wed Jan 3 12:43:42 2024
+++ src/sys/arch/mac68k/mac68k/machdep.c Sat Feb 10 08:24:51 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.366 2024/01/03 12:43:42 thorpej Exp $ */
+/* $NetBSD: machdep.c,v 1.367 2024/02/10 08:24:51 andvar Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -74,7 +74,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.366 2024/01/03 12:43:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.367 2024/02/10 08:24:51 andvar Exp $");
#include "opt_adb.h"
#include "opt_compat_netbsd.h"
@@ -396,7 +396,7 @@ cpu_startup(void)
vers = mac68k_machine.booter_version;
if (vers < CURRENTBOOTERVER) {
- /* fix older booters with indicies, not versions */
+ /* fix older booters with indices, not versions */
if (vers < 100)
vers += 99;
Index: src/sys/arch/sparc/sparc/locore.s
diff -u src/sys/arch/sparc/sparc/locore.s:1.284 src/sys/arch/sparc/sparc/locore.s:1.285
--- src/sys/arch/sparc/sparc/locore.s:1.284 Thu Feb 23 14:56:37 2023
+++ src/sys/arch/sparc/sparc/locore.s Sat Feb 10 08:24:51 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.284 2023/02/23 14:56:37 riastradh Exp $ */
+/* $NetBSD: locore.s,v 1.285 2024/02/10 08:24:51 andvar Exp $ */
/*
* Copyright (c) 1996 Paul Kranenburg
@@ -1405,7 +1405,7 @@ label: b,a 1f; \
* wmask[CWP] tells whether a `rett' would return into the invalid window.
*/
.data
- .skip 32 ! alignment byte & negative indicies
+ .skip 32 ! alignment byte & negative indices
uwtab: .skip 32 ! u_char uwtab[-31..31];
wmask: .skip 32 ! u_char wmask[0..31];
Index: src/sys/dev/gpib/rdreg.h
diff -u src/sys/dev/gpib/rdreg.h:1.6 src/sys/dev/gpib/rdreg.h:1.7
--- src/sys/dev/gpib/rdreg.h:1.6 Tue Feb 8 20:20:27 2011
+++ src/sys/dev/gpib/rdreg.h Sat Feb 10 08:24:51 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: rdreg.h,v 1.6 2011/02/08 20:20:27 rmind Exp $ */
+/* $NetBSD: rdreg.h,v 1.7 2024/02/10 08:24:51 andvar Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -76,7 +76,7 @@ struct rd_rscmd { /* different */
#define RD2200AID 0x22F
#define RD2203AID 0x230 /* yet another guess */
-/* SW ids -- indicies into rdidentinfo, order is arbitrary */
+/* SW ids -- indices into rdidentinfo, order is arbitrary */
#define RD7945A 0
#define RD9134D 1
#define RD9122S 2
Index: src/sys/dev/ic/hd64570.c
diff -u src/sys/dev/ic/hd64570.c:1.57 src/sys/dev/ic/hd64570.c:1.58
--- src/sys/dev/ic/hd64570.c:1.57 Sat Sep 3 02:48:00 2022
+++ src/sys/dev/ic/hd64570.c Sat Feb 10 08:24:51 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: hd64570.c,v 1.57 2022/09/03 02:48:00 thorpej Exp $ */
+/* $NetBSD: hd64570.c,v 1.58 2024/02/10 08:24:51 andvar Exp $ */
/*
* Copyright (c) 1999 Christian E. Hopps
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hd64570.c,v 1.57 2022/09/03 02:48:00 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hd64570.c,v 1.58 2024/02/10 08:24:51 andvar Exp $");
#include "opt_inet.h"
@@ -1756,7 +1756,7 @@ sca_frame_read_done(sca_port_t *scp)
{
u_int16_t edesc_p;
- /* update where our indicies are */
+ /* update where our indices are */
scp->sp_rxend = scp->sp_rxstart;
scp->sp_rxstart = (scp->sp_rxstart + 1) % scp->sp_nrxdesc;
Index: src/sys/dev/mscp/mscp_subr.c
diff -u src/sys/dev/mscp/mscp_subr.c:1.48 src/sys/dev/mscp/mscp_subr.c:1.49
--- src/sys/dev/mscp/mscp_subr.c:1.48 Thu Apr 7 19:33:38 2022
+++ src/sys/dev/mscp/mscp_subr.c Sat Feb 10 08:24:51 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: mscp_subr.c,v 1.48 2022/04/07 19:33:38 andvar Exp $ */
+/* $NetBSD: mscp_subr.c,v 1.49 2024/02/10 08:24:51 andvar Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
* All rights reserved.
@@ -75,7 +75,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mscp_subr.c,v 1.48 2022/04/07 19:33:38 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mscp_subr.c,v 1.49 2024/02/10 08:24:51 andvar Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -372,7 +372,7 @@ mscp_init(struct mscp_softc *mi)
/*
* While we are thinking about it, reset the next command
- * and response indicies.
+ * and response indices.
*/
mi->mi_cmd.mri_next = 0;
mi->mi_rsp.mri_next = 0;
