Module Name: src
Committed By: andvar
Date: Wed Feb 26 04:49:46 UTC 2025
Modified Files:
src/lib/libc/citrus/modules: citrus_mapper_std.c
src/lib/libintl: plural_parser.c
src/sys/arch/hp300/dev: topcat.c
src/sys/arch/hpcmips/dev: plumvideo.c
src/sys/arch/hpcmips/tx: tx3912video.c
src/sys/dev/pci: if_aq.c if_ena.c
src/sys/dev/pci/ixgbe: ixgbe.h
src/sys/netinet: ip_encap.c tcp_subr.c
src/sys/netipsec: ipsec_netbsd.c
src/usr.sbin/rtadvd: rtadvd.c
Log Message:
Fix typos in comments, mainly s/calcurate/calculate/.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/lib/libc/citrus/modules/citrus_mapper_std.c
cvs rdiff -u -r1.4 -r1.5 src/lib/libintl/plural_parser.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/hp300/dev/topcat.c
cvs rdiff -u -r1.45 -r1.46 src/sys/arch/hpcmips/dev/plumvideo.c
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/hpcmips/tx/tx3912video.c
cvs rdiff -u -r1.49 -r1.50 src/sys/dev/pci/if_aq.c
cvs rdiff -u -r1.42 -r1.43 src/sys/dev/pci/if_ena.c
cvs rdiff -u -r1.99 -r1.100 src/sys/dev/pci/ixgbe/ixgbe.h
cvs rdiff -u -r1.77 -r1.78 src/sys/netinet/ip_encap.c
cvs rdiff -u -r1.297 -r1.298 src/sys/netinet/tcp_subr.c
cvs rdiff -u -r1.55 -r1.56 src/sys/netipsec/ipsec_netbsd.c
cvs rdiff -u -r1.82 -r1.83 src/usr.sbin/rtadvd/rtadvd.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/citrus/modules/citrus_mapper_std.c
diff -u src/lib/libc/citrus/modules/citrus_mapper_std.c:1.12 src/lib/libc/citrus/modules/citrus_mapper_std.c:1.13
--- src/lib/libc/citrus/modules/citrus_mapper_std.c:1.12 Mon Jun 11 20:28:23 2018
+++ src/lib/libc/citrus/modules/citrus_mapper_std.c Wed Feb 26 04:49:46 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: citrus_mapper_std.c,v 1.12 2018/06/11 20:28:23 maya Exp $ */
+/* $NetBSD: citrus_mapper_std.c,v 1.13 2025/02/26 04:49:46 andvar Exp $ */
/*-
* Copyright (c)2003, 2006 Citrus Project,
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: citrus_mapper_std.c,v 1.12 2018/06/11 20:28:23 maya Exp $");
+__RCSID("$NetBSD: citrus_mapper_std.c,v 1.13 2025/02/26 04:49:46 andvar Exp $");
#endif /* LIBC_SCCS and not lint */
#include <assert.h>
@@ -322,7 +322,7 @@ rowcol_init(struct _citrus_mapper_std *m
rc->rc_dst_ilseq = be32toh(eix->eix_dst_ilseq);
}
- /* calcurate expected table size */
+ /* calculate expected table size */
i = rc->rc_src_rowcol_len;
lz = &rc->rc_src_rowcol[--i];
table_size = lz->width;
Index: src/lib/libintl/plural_parser.c
diff -u src/lib/libintl/plural_parser.c:1.4 src/lib/libintl/plural_parser.c:1.5
--- src/lib/libintl/plural_parser.c:1.4 Tue Apr 19 20:32:16 2022
+++ src/lib/libintl/plural_parser.c Wed Feb 26 04:49:45 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: plural_parser.c,v 1.4 2022/04/19 20:32:16 rillig Exp $ */
+/* $NetBSD: plural_parser.c,v 1.5 2025/02/26 04:49:45 andvar Exp $ */
/*-
* Copyright (c) 2005 Citrus Project,
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: plural_parser.c,v 1.4 2022/04/19 20:32:16 rillig Exp $");
+__RCSID("$NetBSD: plural_parser.c,v 1.5 2025/02/26 04:49:45 andvar Exp $");
#include <assert.h>
#include <stdio.h>
@@ -785,7 +785,7 @@ main(int argc, char **argv)
#endif /* TEST_PARSER */
/* ----------------------------------------------------------------------
- * calcurate plural number
+ * calculate plural number
*/
static unsigned long
calculate_plural(const struct parser_element *pe, unsigned long n)
Index: src/sys/arch/hp300/dev/topcat.c
diff -u src/sys/arch/hp300/dev/topcat.c:1.13 src/sys/arch/hp300/dev/topcat.c:1.14
--- src/sys/arch/hp300/dev/topcat.c:1.13 Fri Dec 20 22:42:57 2024
+++ src/sys/arch/hp300/dev/topcat.c Wed Feb 26 04:49:46 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: topcat.c,v 1.13 2024/12/20 22:42:57 tsutsui Exp $ */
+/* $NetBSD: topcat.c,v 1.14 2025/02/26 04:49:46 andvar Exp $ */
/* $OpenBSD: topcat.c,v 1.15 2006/08/11 18:33:13 miod Exp $ */
/*
@@ -355,7 +355,7 @@ topcat_reset(struct diofb *fb, int scode
* enough 64KB (1bpp) or 256KB (4bpp) VRAM and RAMDAC capabilities
* to display 1024x400 pixels.
*
- * However HP's officlal "Service Information Manual" for
+ * However HP's official "Service Information Manual" for
* "HP 900 Series 300 Computers Models 330/350" says:
* "The medium-resolution board uses eight memory chips per plane.
* This is enough to display 512 doubled pixels by 400 scan lines."
Index: src/sys/arch/hpcmips/dev/plumvideo.c
diff -u src/sys/arch/hpcmips/dev/plumvideo.c:1.45 src/sys/arch/hpcmips/dev/plumvideo.c:1.46
--- src/sys/arch/hpcmips/dev/plumvideo.c:1.45 Sun Sep 10 15:03:56 2023
+++ src/sys/arch/hpcmips/dev/plumvideo.c Wed Feb 26 04:49:46 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: plumvideo.c,v 1.45 2023/09/10 15:03:56 andvar Exp $ */
+/* $NetBSD: plumvideo.c,v 1.46 2025/02/26 04:49:46 andvar Exp $ */
/*-
* Copyright (c) 1999-2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: plumvideo.c,v 1.45 2023/09/10 15:03:56 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: plumvideo.c,v 1.46 2025/02/26 04:49:46 andvar Exp $");
#include "plumohci.h" /* Plum2 OHCI shared memory allocated on V-RAM */
#include "bivideo.h"
@@ -395,7 +395,7 @@ plumvideo_init(struct plumvideo_softc *s
}
/*
- * calcurate frame buffer size.
+ * calculate frame buffer size.
*/
reg = plum_conf_read(regt, regh, PLUM_VIDEO_PLGMD_REG);
vram_size = (width * height * bpp) / NBBY;
Index: src/sys/arch/hpcmips/tx/tx3912video.c
diff -u src/sys/arch/hpcmips/tx/tx3912video.c:1.48 src/sys/arch/hpcmips/tx/tx3912video.c:1.49
--- src/sys/arch/hpcmips/tx/tx3912video.c:1.48 Mon Aug 9 19:24:33 2021
+++ src/sys/arch/hpcmips/tx/tx3912video.c Wed Feb 26 04:49:46 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: tx3912video.c,v 1.48 2021/08/09 19:24:33 andvar Exp $ */
+/* $NetBSD: tx3912video.c,v 1.49 2025/02/26 04:49:46 andvar Exp $ */
/*-
* Copyright (c) 1999-2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tx3912video.c,v 1.48 2021/08/09 19:24:33 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tx3912video.c,v 1.49 2025/02/26 04:49:46 andvar Exp $");
#define TX3912VIDEO_DEBUG
@@ -362,7 +362,7 @@ tx3912video_framebuffer_alloc(struct vid
u_long addr, size;
int error;
- /* calcurate frame buffer size */
+ /* calculate frame buffer size */
size = (chip->vc_fbwidth * chip->vc_fbheight * chip->vc_fbdepth) /
NBBY;
Index: src/sys/dev/pci/if_aq.c
diff -u src/sys/dev/pci/if_aq.c:1.49 src/sys/dev/pci/if_aq.c:1.50
--- src/sys/dev/pci/if_aq.c:1.49 Fri Jul 5 04:31:51 2024
+++ src/sys/dev/pci/if_aq.c Wed Feb 26 04:49:46 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: if_aq.c,v 1.49 2024/07/05 04:31:51 rin Exp $ */
+/* $NetBSD: if_aq.c,v 1.50 2025/02/26 04:49:46 andvar Exp $ */
/**
* aQuantia Corporation Network Driver
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_aq.c,v 1.49 2024/07/05 04:31:51 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_aq.c,v 1.50 2025/02/26 04:49:46 andvar Exp $");
#ifdef _KERNEL_OPT
#include "opt_if_aq.h"
@@ -4572,7 +4572,7 @@ aq_update_statistics(struct aq_softc *sc
/*
* some aq's internal statistics counters are 32bit.
- * cauculate delta, and add to evcount
+ * calculate delta, and add to evcount
*/
#define ADD_DELTA(cur, prev, name) \
do { \
Index: src/sys/dev/pci/if_ena.c
diff -u src/sys/dev/pci/if_ena.c:1.42 src/sys/dev/pci/if_ena.c:1.43
--- src/sys/dev/pci/if_ena.c:1.42 Sat Jun 29 12:11:12 2024
+++ src/sys/dev/pci/if_ena.c Wed Feb 26 04:49:46 2025
@@ -32,7 +32,7 @@
#if 0
__FBSDID("$FreeBSD: head/sys/dev/ena/ena.c 333456 2018-05-10 09:37:54Z mw $");
#endif
-__KERNEL_RCSID(0, "$NetBSD: if_ena.c,v 1.42 2024/06/29 12:11:12 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ena.c,v 1.43 2025/02/26 04:49:46 andvar Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -3764,7 +3764,7 @@ ena_attach(device_t parent, device_t sel
adapter->max_mtu = get_feat_ctx.dev_attr.max_mtu;
- /* calculatre ring sizes */
+ /* calculate ring sizes */
queue_size = ena_calc_queue_size(adapter,&tx_sgl_size,
&rx_sgl_size, &get_feat_ctx);
if (unlikely((queue_size <= 0) || (io_queue_num <= 0))) {
Index: src/sys/dev/pci/ixgbe/ixgbe.h
diff -u src/sys/dev/pci/ixgbe/ixgbe.h:1.99 src/sys/dev/pci/ixgbe/ixgbe.h:1.100
--- src/sys/dev/pci/ixgbe/ixgbe.h:1.99 Thu Sep 19 17:57:15 2024
+++ src/sys/dev/pci/ixgbe/ixgbe.h Wed Feb 26 04:49:46 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.h,v 1.99 2024/09/19 17:57:15 andvar Exp $ */
+/* $NetBSD: ixgbe.h,v 1.100 2025/02/26 04:49:46 andvar Exp $ */
/******************************************************************************
SPDX-License-Identifier: BSD-3-Clause
@@ -332,7 +332,7 @@ struct ix_queue {
struct rx_ring *rxr;
struct work wq_cookie;
void *que_si;
- /* Per queue event conters */
+ /* Per queue event counters */
struct evcnt irqs; /* Hardware interrupt */
struct evcnt handleq; /* software_interrupt */
struct evcnt req; /* deferred */
@@ -389,7 +389,7 @@ struct tx_ring {
struct evcnt pcq_drops;
struct evcnt no_desc_avail;
struct evcnt tso_tx;
- /* Per queue conters. The adapter total is in struct adapter */
+ /* Per queue counters. The adapter total is in struct adapter */
u64 q_efbig_tx_dma_setup;
u64 q_mbuf_defrag_failed;
u64 q_efbig2_tx_dma_setup;
Index: src/sys/netinet/ip_encap.c
diff -u src/sys/netinet/ip_encap.c:1.77 src/sys/netinet/ip_encap.c:1.78
--- src/sys/netinet/ip_encap.c:1.77 Wed Dec 7 08:33:02 2022
+++ src/sys/netinet/ip_encap.c Wed Feb 26 04:49:45 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_encap.c,v 1.77 2022/12/07 08:33:02 knakahara Exp $ */
+/* $NetBSD: ip_encap.c,v 1.78 2025/02/26 04:49:45 andvar Exp $ */
/* $KAME: ip_encap.c,v 1.73 2001/10/02 08:30:58 itojun Exp $ */
/*
@@ -58,7 +58,7 @@
/* XXX is M_NETADDR correct? */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_encap.c,v 1.77 2022/12/07 08:33:02 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_encap.c,v 1.78 2025/02/26 04:49:45 andvar Exp $");
#ifdef _KERNEL_OPT
#include "opt_mrouting.h"
@@ -757,7 +757,7 @@ encap6_ctlinput(int cmd, const struct so
/*
* Depending on the value of "valid" and routing table
* size (mtudisc_{hi,lo}wat), we will:
- * - recalcurate the new MTU and create the
+ * - recalculate the new MTU and create the
* corresponding routing entry, or
* - ignore the MTU change notification.
*/
Index: src/sys/netinet/tcp_subr.c
diff -u src/sys/netinet/tcp_subr.c:1.297 src/sys/netinet/tcp_subr.c:1.298
--- src/sys/netinet/tcp_subr.c:1.297 Fri Jul 5 04:31:54 2024
+++ src/sys/netinet/tcp_subr.c Wed Feb 26 04:49:45 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_subr.c,v 1.297 2024/07/05 04:31:54 rin Exp $ */
+/* $NetBSD: tcp_subr.c,v 1.298 2025/02/26 04:49:45 andvar Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_subr.c,v 1.297 2024/07/05 04:31:54 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_subr.c,v 1.298 2025/02/26 04:49:45 andvar Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1344,7 +1344,7 @@ tcp6_ctlinput(int cmd, const struct sock
/*
* Depending on the value of "valid" and routing table
* size (mtudisc_{hi,lo}wat), we will:
- * - recalcurate the new MTU and create the
+ * - recalculate the new MTU and create the
* corresponding routing entry, or
* - ignore the MTU change notification.
*/
Index: src/sys/netipsec/ipsec_netbsd.c
diff -u src/sys/netipsec/ipsec_netbsd.c:1.55 src/sys/netipsec/ipsec_netbsd.c:1.56
--- src/sys/netipsec/ipsec_netbsd.c:1.55 Fri Sep 2 23:48:11 2022
+++ src/sys/netipsec/ipsec_netbsd.c Wed Feb 26 04:49:46 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: ipsec_netbsd.c,v 1.55 2022/09/02 23:48:11 thorpej Exp $ */
+/* $NetBSD: ipsec_netbsd.c,v 1.56 2025/02/26 04:49:46 andvar Exp $ */
/* $KAME: esp_input.c,v 1.60 2001/09/04 08:43:19 itojun Exp $ */
/* $KAME: ah_input.c,v 1.64 2001/09/04 08:43:19 itojun Exp $ */
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipsec_netbsd.c,v 1.55 2022/09/02 23:48:11 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipsec_netbsd.c,v 1.56 2025/02/26 04:49:46 andvar Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -332,7 +332,7 @@ esp6_ctlinput(int cmd, const struct sock
/*
* Depending on the value of "valid" and routing table
* size (mtudisc_{hi,lo}wat), we will:
- * - recalcurate the new MTU and create the
+ * - recalculate the new MTU and create the
* corresponding routing entry, or
* - ignore the MTU change notification.
*/
Index: src/usr.sbin/rtadvd/rtadvd.c
diff -u src/usr.sbin/rtadvd/rtadvd.c:1.82 src/usr.sbin/rtadvd/rtadvd.c:1.83
--- src/usr.sbin/rtadvd/rtadvd.c:1.82 Tue Mar 23 18:13:07 2021
+++ src/usr.sbin/rtadvd/rtadvd.c Wed Feb 26 04:49:46 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: rtadvd.c,v 1.82 2021/03/23 18:13:07 christos Exp $ */
+/* $NetBSD: rtadvd.c,v 1.83 2025/02/26 04:49:46 andvar Exp $ */
/* $KAME: rtadvd.c,v 1.92 2005/10/17 14:40:02 suz Exp $ */
/*
@@ -1683,7 +1683,7 @@ ra_output(struct rainfo *rai, bool solic
free(sol);
}
- /* reset waiting conter */
+ /* reset waiting counter */
rai->waiting = 0;
/* disable timer */
