Module Name: src
Committed By: andvar
Date: Sun Nov 7 20:31:10 UTC 2021
Modified Files:
src/games/quiz: rxp.c
src/lib/libc/compat/net: compat_ns_addr.c
src/lib/libresolv: dst_internal.h
src/lib/librpcsvc: nfs_prot.x
src/sys/dev/dm/doc: design.txt
src/sys/netinet: dccp_var.h
src/tests/usr.bin/sed: t_sed.sh
src/usr.sbin/sysinst: partitions.h
Log Message:
fix various typos, mainly s/prefered/preferred/
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/games/quiz/rxp.c
cvs rdiff -u -r1.3 -r1.4 src/lib/libc/compat/net/compat_ns_addr.c
cvs rdiff -u -r1.2 -r1.3 src/lib/libresolv/dst_internal.h
cvs rdiff -u -r1.7 -r1.8 src/lib/librpcsvc/nfs_prot.x
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/dm/doc/design.txt
cvs rdiff -u -r1.5 -r1.6 src/sys/netinet/dccp_var.h
cvs rdiff -u -r1.8 -r1.9 src/tests/usr.bin/sed/t_sed.sh
cvs rdiff -u -r1.24 -r1.25 src/usr.sbin/sysinst/partitions.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/quiz/rxp.c
diff -u src/games/quiz/rxp.c:1.13 src/games/quiz/rxp.c:1.14
--- src/games/quiz/rxp.c:1.13 Thu Aug 27 00:31:12 2009
+++ src/games/quiz/rxp.c Sun Nov 7 20:31:09 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: rxp.c,v 1.13 2009/08/27 00:31:12 dholland Exp $ */
+/* $NetBSD: rxp.c,v 1.14 2021/11/07 20:31:09 andvar Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)rxp.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: rxp.c,v 1.13 2009/08/27 00:31:12 dholland Exp $");
+__RCSID("$NetBSD: rxp.c,v 1.14 2021/11/07 20:31:09 andvar Exp $");
#endif
#endif /* not lint */
@@ -50,7 +50,7 @@ __RCSID("$NetBSD: rxp.c,v 1.13 2009/08/2
* TRUE success
* FALSE parse failure; error message will be in char rxperr[]
* metas are:
- * {...} optional pattern, equialent to [...|]
+ * {...} optional pattern, equivalent to [...|]
* | alternate pattern
* [...] pattern delimiters
*
Index: src/lib/libc/compat/net/compat_ns_addr.c
diff -u src/lib/libc/compat/net/compat_ns_addr.c:1.3 src/lib/libc/compat/net/compat_ns_addr.c:1.4
--- src/lib/libc/compat/net/compat_ns_addr.c:1.3 Mon Oct 15 22:22:01 2012
+++ src/lib/libc/compat/net/compat_ns_addr.c Sun Nov 7 20:31:09 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_ns_addr.c,v 1.3 2012/10/15 22:22:01 msaitoh Exp $ */
+/* $NetBSD: compat_ns_addr.c,v 1.4 2021/11/07 20:31:09 andvar Exp $ */
/*
* Copyright (c) 1986, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)ns_addr.c 8.1 (Berkeley) 6/7/93";
#else
-__RCSID("$NetBSD: compat_ns_addr.c,v 1.3 2012/10/15 22:22:01 msaitoh Exp $");
+__RCSID("$NetBSD: compat_ns_addr.c,v 1.4 2021/11/07 20:31:09 andvar Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -65,10 +65,10 @@ ns_addr(const char *name)
(void)strlcpy(buf, name, sizeof(buf));
/*
- * First, figure out what he intends as a field separtor.
- * Despite the way this routine is written, the prefered
+ * First, figure out what he intends as a field separator.
+ * Despite the way this routine is written, the preferred
* form 2-272.AA001234H.01777, i.e. XDE standard.
- * Great efforts are made to insure backward compatibility.
+ * Great efforts are made to ensure backward compatibility.
*/
if ((hostname = strchr(buf, '#')) != NULL)
separator = '#';
@@ -138,7 +138,7 @@ Field(char *buf, uint8_t *out, int len)
}
/*
* This is REALLY stretching it but there was a
- * comma notation separting shorts -- definitely non standard
+ * comma notation separating shorts -- definitely non standard
*/
if (1 < (i = sscanf(buf,"%x,%x,%x",
&hb[0], &hb[1], &hb[2]))) {
Index: src/lib/libresolv/dst_internal.h
diff -u src/lib/libresolv/dst_internal.h:1.2 src/lib/libresolv/dst_internal.h:1.3
--- src/lib/libresolv/dst_internal.h:1.2 Fri Nov 16 02:11:05 2012
+++ src/lib/libresolv/dst_internal.h Sun Nov 7 20:31:09 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: dst_internal.h,v 1.2 2012/11/16 02:11:05 joerg Exp $ */
+/* $NetBSD: dst_internal.h,v 1.3 2021/11/07 20:31:09 andvar Exp $ */
#ifndef DST_INTERNAL_H
#define DST_INTERNAL_H
@@ -50,7 +50,7 @@ typedef struct dst_key {
#include <isc/dst.h>
/*
* define what crypto systems are supported for RSA,
- * BSAFE is prefered over RSAREF; only one can be set at any time
+ * BSAFE is preferred over RSAREF; only one can be set at any time
*/
#if defined(BSAFE) && defined(RSAREF)
# error "Cannot have both BSAFE and RSAREF defined"
Index: src/lib/librpcsvc/nfs_prot.x
diff -u src/lib/librpcsvc/nfs_prot.x:1.7 src/lib/librpcsvc/nfs_prot.x:1.8
--- src/lib/librpcsvc/nfs_prot.x:1.7 Thu Jul 1 22:52:34 2004
+++ src/lib/librpcsvc/nfs_prot.x Sun Nov 7 20:31:09 2021
@@ -32,7 +32,7 @@
%#ifndef __lint__
%/*static char sccsid[] = "from: @(#)nfs_prot.x 1.2 87/10/12 Copyr 1987 Sun Micro";*/
%/*static char sccsid[] = "from: @(#)nfs_prot.x 2.1 88/08/01 4.0 RPCSRC";*/
-%__RCSID("$NetBSD: nfs_prot.x,v 1.7 2004/07/01 22:52:34 kleink Exp $");
+%__RCSID("$NetBSD: nfs_prot.x,v 1.8 2021/11/07 20:31:09 andvar Exp $");
%#endif /* not __lint__ */
#endif
@@ -121,7 +121,7 @@ struct fattr {
unsigned uid; /* owner user id */
unsigned gid; /* owner group id */
unsigned size; /* file size in bytes */
- unsigned blocksize; /* prefered block size */
+ unsigned blocksize; /* preferred block size */
unsigned rdev; /* special device # */
unsigned blocks; /* Kb of disk used by file */
unsigned fsid; /* device # */
@@ -396,7 +396,7 @@ struct fattr3 {
uid3 uid; /* owner user id */
gid3 gid; /* owner group id */
size3 size; /* file size in bytes */
- size3 used; /* prefered block size */
+ size3 used; /* preferred block size */
specdata3 rdev; /* special device # */
u_int64_t fsid; /* device # */
fileid3 fileid; /* inode # */
Index: src/sys/dev/dm/doc/design.txt
diff -u src/sys/dev/dm/doc/design.txt:1.5 src/sys/dev/dm/doc/design.txt:1.6
--- src/sys/dev/dm/doc/design.txt:1.5 Sat Aug 21 22:23:33 2021
+++ src/sys/dev/dm/doc/design.txt Sun Nov 7 20:31:09 2021
@@ -88,7 +88,7 @@
out: none
Function:
- Create device in dm driver, with specified name/uuid(uuid is prefered).
+ Create device in dm driver, with specified name/uuid(uuid is preferred).
(linux use struct dm_name_list)
5) DM_DEV_REMOVE
Index: src/sys/netinet/dccp_var.h
diff -u src/sys/netinet/dccp_var.h:1.5 src/sys/netinet/dccp_var.h:1.6
--- src/sys/netinet/dccp_var.h:1.5 Fri Sep 14 05:09:51 2018
+++ src/sys/netinet/dccp_var.h Sun Nov 7 20:31:09 2021
@@ -1,5 +1,5 @@
/* $KAME: dccp_var.h,v 1.29 2005/11/03 14:59:28 nishida Exp $ */
-/* $NetBSD: dccp_var.h,v 1.5 2018/09/14 05:09:51 maxv Exp $ */
+/* $NetBSD: dccp_var.h,v 1.6 2021/11/07 20:31:09 andvar Exp $ */
/*
* Copyright (c) 2003 Joacim Häggmark, Magnus Erixzon, Nils-Erik Mattsson
@@ -88,7 +88,7 @@ struct dccpcb {
u_int8_t ndp_rcv; /* ndp value of received packet */
u_int8_t cslen; /* How much of outgoing packets are covered by the checksum */
- u_int8_t pref_cc; /* Client prefered CC */
+ u_int8_t pref_cc; /* Client preferred CC */
u_int8_t ndp; /* Number of non data packets */
u_int32_t loss_window; /* Loss window (defaults to 1000) */
u_int16_t ack_ratio; /* Ack Ratio Feature */
Index: src/tests/usr.bin/sed/t_sed.sh
diff -u src/tests/usr.bin/sed/t_sed.sh:1.8 src/tests/usr.bin/sed/t_sed.sh:1.9
--- src/tests/usr.bin/sed/t_sed.sh:1.8 Tue Feb 23 21:09:14 2021
+++ src/tests/usr.bin/sed/t_sed.sh Sun Nov 7 20:31:09 2021
@@ -1,4 +1,4 @@
-# $NetBSD: t_sed.sh,v 1.8 2021/02/23 21:09:14 christos Exp $
+# $NetBSD: t_sed.sh,v 1.9 2021/11/07 20:31:09 andvar Exp $
#
# Copyright (c) 2012 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -133,7 +133,7 @@ preserve_leading_ws_ia_body() {
atf_test_case escapes_in_subst
escapes_in_subst_head() {
atf_set "descr" "Test that sed(1) expands \x \d \o escapes " \
- "in substition strings"
+ "in substitution strings"
}
escapes_in_subst_body() {
Index: src/usr.sbin/sysinst/partitions.h
diff -u src/usr.sbin/sysinst/partitions.h:1.24 src/usr.sbin/sysinst/partitions.h:1.25
--- src/usr.sbin/sysinst/partitions.h:1.24 Sat Sep 11 21:30:46 2021
+++ src/usr.sbin/sysinst/partitions.h Sun Nov 7 20:31:09 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: partitions.h,v 1.24 2021/09/11 21:30:46 andvar Exp $ */
+/* $NetBSD: partitions.h,v 1.25 2021/11/07 20:31:09 andvar Exp $ */
/*
* Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -240,11 +240,11 @@ struct disk_partitioning_scheme {
size_t (*get_part_types_count)(void);
const struct part_type_desc * (*get_part_type)(size_t ndx);
/*
- * Get the prefered native representation for a generic partition type
+ * Get the preferred native representation for a generic partition type
*/
const struct part_type_desc * (*get_generic_part_type)(enum part_type);
/*
- * Get the prefered native partition type for a specific file system
+ * Get the preferred native partition type for a specific file system
* type (FS_*) and subtype (fs specific value)
*/
const struct part_type_desc * (*get_fs_part_type)(
