Module Name: src
Committed By: wiz
Date: Wed Dec 2 14:20:20 UTC 2020
Modified Files:
src/doc: HACKS
src/lib/libc_vfp: vfpdf.S vfpsf.S
src/sys/arch/arm/cortex: a9tmr.c
src/sys/arch/mac68k/mac68k: pram.c
src/sys/net: if_sppp.h
src/usr.sbin/etcupdate: etcupdate
src/usr.sbin/sysinst: label.c partitions.h
Log Message:
comparision -> comparison
To generate a diff of this commit:
cvs rdiff -u -r1.214 -r1.215 src/doc/HACKS
cvs rdiff -u -r1.4 -r1.5 src/lib/libc_vfp/vfpdf.S src/lib/libc_vfp/vfpsf.S
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/arm/cortex/a9tmr.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/mac68k/mac68k/pram.c
cvs rdiff -u -r1.29 -r1.30 src/sys/net/if_sppp.h
cvs rdiff -u -r1.60 -r1.61 src/usr.sbin/etcupdate/etcupdate
cvs rdiff -u -r1.30 -r1.31 src/usr.sbin/sysinst/label.c
cvs rdiff -u -r1.20 -r1.21 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/doc/HACKS
diff -u src/doc/HACKS:1.214 src/doc/HACKS:1.215
--- src/doc/HACKS:1.214 Thu Oct 8 08:31:37 2020
+++ src/doc/HACKS Wed Dec 2 14:20:19 2020
@@ -1,4 +1,4 @@
-# $NetBSD: HACKS,v 1.214 2020/10/08 08:31:37 rin Exp $
+# $NetBSD: HACKS,v 1.215 2020/12/02 14:20:19 wiz Exp $
#
# This file is intended to document workarounds for currently unsolved
# (mostly) compiler bugs.
@@ -300,7 +300,7 @@ file usr.sbin/rbootd/Makefile : 1.10
file usr.sbin/rpc.pcnfsd/Makefile : 1.17
file usr.sbin/tcpdump/Makefile : 1.42
descr
- GCC 4.1 warns on pointer sign comparision/assignments and lots of
+ GCC 4.1 warns on pointer sign comparison/assignments and lots of
code does not conform. For now we use -Wno-pointer-sign and
-fno-strict-aliasing.
kcah
Index: src/lib/libc_vfp/vfpdf.S
diff -u src/lib/libc_vfp/vfpdf.S:1.4 src/lib/libc_vfp/vfpdf.S:1.5
--- src/lib/libc_vfp/vfpdf.S:1.4 Thu Jul 19 19:35:02 2018
+++ src/lib/libc_vfp/vfpdf.S Wed Dec 2 14:20:20 2020
@@ -29,7 +29,7 @@
#include <arm/asm.h>
-RCSID("$NetBSD: vfpdf.S,v 1.4 2018/07/19 19:35:02 joerg Exp $")
+RCSID("$NetBSD: vfpdf.S,v 1.5 2020/12/02 14:20:20 wiz Exp $")
/*
* This file provides softfloat compatible routines which use VFP instructions
@@ -145,7 +145,7 @@ ENTRY(__floatunsidf)
END(__floatunsidf)
/*
- * Effect of a floating point comparision on the condition flags.
+ * Effect of a floating point comparison on the condition flags.
* N Z C V
* EQ = 0 1 1 0
* LT = 1 0 0 0
Index: src/lib/libc_vfp/vfpsf.S
diff -u src/lib/libc_vfp/vfpsf.S:1.4 src/lib/libc_vfp/vfpsf.S:1.5
--- src/lib/libc_vfp/vfpsf.S:1.4 Thu Jul 19 19:35:02 2018
+++ src/lib/libc_vfp/vfpsf.S Wed Dec 2 14:20:20 2020
@@ -30,7 +30,7 @@
#include <arm/asm.h>
#include <arm/vfpreg.h>
-RCSID("$NetBSD: vfpsf.S,v 1.4 2018/07/19 19:35:02 joerg Exp $")
+RCSID("$NetBSD: vfpsf.S,v 1.5 2020/12/02 14:20:20 wiz Exp $")
/*
* This file provides softfloat compatible routines which use VFP instructions
@@ -139,7 +139,7 @@ ENTRY(__floatunsisf)
END(__floatunsisf)
/*
- * Effect of a floating point comparision on the condition flags.
+ * Effect of a floating point comparison on the condition flags.
* N Z C V
* EQ = 0 1 1 0
* LT = 1 0 0 0
Index: src/sys/arch/arm/cortex/a9tmr.c
diff -u src/sys/arch/arm/cortex/a9tmr.c:1.20 src/sys/arch/arm/cortex/a9tmr.c:1.21
--- src/sys/arch/arm/cortex/a9tmr.c:1.20 Tue Jun 11 12:48:30 2019
+++ src/sys/arch/arm/cortex/a9tmr.c Wed Dec 2 14:20:20 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: a9tmr.c,v 1.20 2019/06/11 12:48:30 skrll Exp $ */
+/* $NetBSD: a9tmr.c,v 1.21 2020/12/02 14:20:20 wiz Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: a9tmr.c,v 1.20 2019/06/11 12:48:30 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: a9tmr.c,v 1.21 2020/12/02 14:20:20 wiz Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -189,7 +189,7 @@ a9tmr_init_cpu_clock(struct cpu_info *ci
a9tmr_global_write(sc, TMR_GBL_AUTOINC, sc->sc_autoinc);
/*
- * To update the compare register we have to disable comparisions first.
+ * To update the compare register we have to disable comparisons first.
*/
uint32_t ctl = a9tmr_global_read(sc, TMR_GBL_CTL);
if (ctl & TMR_GBL_CTL_CMP_ENABLE) {
Index: src/sys/arch/mac68k/mac68k/pram.c
diff -u src/sys/arch/mac68k/mac68k/pram.c:1.24 src/sys/arch/mac68k/mac68k/pram.c:1.25
--- src/sys/arch/mac68k/mac68k/pram.c:1.24 Fri Jun 19 16:30:31 2020
+++ src/sys/arch/mac68k/mac68k/pram.c Wed Dec 2 14:20:20 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pram.c,v 1.24 2020/06/19 16:30:31 tsutsui Exp $ */
+/* $NetBSD: pram.c,v 1.25 2020/12/02 14:20:20 wiz Exp $ */
/*-
* Copyright (C) 1993 Allen K. Briggs, Chris P. Caputo,
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pram.c,v 1.24 2020/06/19 16:30:31 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pram.c,v 1.25 2020/12/02 14:20:20 wiz Exp $");
#include "opt_adb.h"
@@ -129,7 +129,7 @@ pram_readtime(void)
#ifdef MRG_ADB
if (0 == jClkNoMem)
- timedata = 0; /* cause comparision of MacOS boottime */
+ timedata = 0; /* cause comparison of MacOS boottime */
/* and PRAM time to fail */
else
#endif
Index: src/sys/net/if_sppp.h
diff -u src/sys/net/if_sppp.h:1.29 src/sys/net/if_sppp.h:1.30
--- src/sys/net/if_sppp.h:1.29 Wed Nov 25 10:30:51 2020
+++ src/sys/net/if_sppp.h Wed Dec 2 14:20:20 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_sppp.h,v 1.29 2020/11/25 10:30:51 yamaguchi Exp $ */
+/* $NetBSD: if_sppp.h,v 1.30 2020/12/02 14:20:20 wiz Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -74,7 +74,7 @@ struct sppplcpcfg {
/*
* Don't change the order of this. Ordering the phases this way allows
- * for a comparision of ``pp_phase >= PHASE_AUTHENTICATE'' in order to
+ * for a comparison of ``pp_phase >= PHASE_AUTHENTICATE'' in order to
* know whether LCP is up.
*/
#define SPPP_PHASE_DEAD 0
Index: src/usr.sbin/etcupdate/etcupdate
diff -u src/usr.sbin/etcupdate/etcupdate:1.60 src/usr.sbin/etcupdate/etcupdate:1.61
--- src/usr.sbin/etcupdate/etcupdate:1.60 Sun Jan 3 08:44:59 2016
+++ src/usr.sbin/etcupdate/etcupdate Wed Dec 2 14:20:20 2020
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: etcupdate,v 1.60 2016/01/03 08:44:59 martin Exp $
+# $NetBSD: etcupdate,v 1.61 2020/12/02 14:20:20 wiz Exp $
#
# Copyright (c) 2001-2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -649,7 +649,7 @@ if ! ${CONTINUE}; then
echo ""
fi
- # Ignore the following files during comparision
+ # Ignore the following files during comparison
rm -f "${TEMPROOT}"/etc/passwd
rm -f "${TEMPROOT}"/etc/pwd.db
rm -f "${TEMPROOT}"/etc/spwd.db
@@ -674,7 +674,7 @@ if ! ${CONTINUE}; then
done
fi
-# Start the comparision
+# Start the comparison
echo "*** Checking for added/modified files"
init_diff_extra_options
exec 3<&0
Index: src/usr.sbin/sysinst/label.c
diff -u src/usr.sbin/sysinst/label.c:1.30 src/usr.sbin/sysinst/label.c:1.31
--- src/usr.sbin/sysinst/label.c:1.30 Tue Oct 13 17:26:28 2020
+++ src/usr.sbin/sysinst/label.c Wed Dec 2 14:20:20 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: label.c,v 1.30 2020/10/13 17:26:28 martin Exp $ */
+/* $NetBSD: label.c,v 1.31 2020/12/02 14:20:20 wiz Exp $ */
/*
* Copyright 1997 Jonathan Stone
@@ -36,7 +36,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: label.c,v 1.30 2020/10/13 17:26:28 martin Exp $");
+__RCSID("$NetBSD: label.c,v 1.31 2020/12/02 14:20:20 wiz Exp $");
#endif
#include <sys/types.h>
@@ -1871,7 +1871,7 @@ edit_and_check_label(struct pm_devs *p,
}
/*
- * strip trailing / to avoid confusion in path comparisions later
+ * strip trailing / to avoid confusion in path comparisons later
*/
void
canonicalize_last_mounted(char *path)
Index: src/usr.sbin/sysinst/partitions.h
diff -u src/usr.sbin/sysinst/partitions.h:1.20 src/usr.sbin/sysinst/partitions.h:1.21
--- src/usr.sbin/sysinst/partitions.h:1.20 Fri Nov 6 12:23:10 2020
+++ src/usr.sbin/sysinst/partitions.h Wed Dec 2 14:20:20 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: partitions.h,v 1.20 2020/11/06 12:23:10 martin Exp $ */
+/* $NetBSD: partitions.h,v 1.21 2020/12/02 14:20:20 wiz Exp $ */
/*
* Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -100,7 +100,7 @@ enum part_type {
* purposes. The internal details may be richer and the *pointer* value
* is the unique token - that is: the partitioning scheme will hand out
* pointers to internal data and recognize the exact partition type details
- * by pointer comparision.
+ * by pointer comparison.
*/
struct part_type_desc {
enum part_type generic_ptype; /* what this maps to in generic terms */
