Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src comparision -> comparison



details:   https://anonhg.NetBSD.org/src/rev/0952d5819925
branches:  trunk
changeset: 946586:0952d5819925
user:      wiz <wiz%NetBSD.org@localhost>
date:      Wed Dec 02 14:20:19 2020 +0000

description:
comparision -> comparison

diffstat:

 doc/HACKS                     |  4 ++--
 lib/libc_vfp/vfpdf.S          |  4 ++--
 lib/libc_vfp/vfpsf.S          |  4 ++--
 sys/arch/arm/cortex/a9tmr.c   |  6 +++---
 sys/arch/mac68k/mac68k/pram.c |  6 +++---
 sys/net/if_sppp.h             |  4 ++--
 usr.sbin/etcupdate/etcupdate  |  6 +++---
 usr.sbin/sysinst/label.c      |  6 +++---
 usr.sbin/sysinst/partitions.h |  4 ++--
 9 files changed, 22 insertions(+), 22 deletions(-)

diffs (206 lines):

diff -r e9427eac9756 -r 0952d5819925 doc/HACKS
--- a/doc/HACKS Wed Dec 02 14:18:13 2020 +0000
+++ b/doc/HACKS Wed Dec 02 14:20:19 2020 +0000
@@ -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/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
diff -r e9427eac9756 -r 0952d5819925 lib/libc_vfp/vfpdf.S
--- a/lib/libc_vfp/vfpdf.S      Wed Dec 02 14:18:13 2020 +0000
+++ b/lib/libc_vfp/vfpdf.S      Wed Dec 02 14:20:19 2020 +0000
@@ -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 @@
 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
diff -r e9427eac9756 -r 0952d5819925 lib/libc_vfp/vfpsf.S
--- a/lib/libc_vfp/vfpsf.S      Wed Dec 02 14:18:13 2020 +0000
+++ b/lib/libc_vfp/vfpsf.S      Wed Dec 02 14:20:19 2020 +0000
@@ -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 @@
 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
diff -r e9427eac9756 -r 0952d5819925 sys/arch/arm/cortex/a9tmr.c
--- a/sys/arch/arm/cortex/a9tmr.c       Wed Dec 02 14:18:13 2020 +0000
+++ b/sys/arch/arm/cortex/a9tmr.c       Wed Dec 02 14:20:19 2020 +0000
@@ -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_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) {
diff -r e9427eac9756 -r 0952d5819925 sys/arch/mac68k/mac68k/pram.c
--- a/sys/arch/mac68k/mac68k/pram.c     Wed Dec 02 14:18:13 2020 +0000
+++ b/sys/arch/mac68k/mac68k/pram.c     Wed Dec 02 14:20:19 2020 +0000
@@ -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 @@
 
 #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
diff -r e9427eac9756 -r 0952d5819925 sys/net/if_sppp.h
--- a/sys/net/if_sppp.h Wed Dec 02 14:18:13 2020 +0000
+++ b/sys/net/if_sppp.h Wed Dec 02 14:20:19 2020 +0000
@@ -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 @@
 
 /*
  * 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
diff -r e9427eac9756 -r 0952d5819925 usr.sbin/etcupdate/etcupdate
--- a/usr.sbin/etcupdate/etcupdate      Wed Dec 02 14:18:13 2020 +0000
+++ b/usr.sbin/etcupdate/etcupdate      Wed Dec 02 14:20:19 2020 +0000
@@ -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 @@
                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 @@
        done
 fi
 
-# Start the comparision
+# Start the comparison
 echo "*** Checking for added/modified files"
 init_diff_extra_options
 exec 3<&0
diff -r e9427eac9756 -r 0952d5819925 usr.sbin/sysinst/label.c
--- a/usr.sbin/sysinst/label.c  Wed Dec 02 14:18:13 2020 +0000
+++ b/usr.sbin/sysinst/label.c  Wed Dec 02 14:20:19 2020 +0000
@@ -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 @@
 }
 
 /*
- * strip trailing / to avoid confusion in path comparisions later
+ * strip trailing / to avoid confusion in path comparisons later
  */
 void
 canonicalize_last_mounted(char *path)
diff -r e9427eac9756 -r 0952d5819925 usr.sbin/sysinst/partitions.h
--- a/usr.sbin/sysinst/partitions.h     Wed Dec 02 14:18:13 2020 +0000
+++ b/usr.sbin/sysinst/partitions.h     Wed Dec 02 14:20:19 2020 +0000
@@ -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 @@
  * 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 */



Home | Main Index | Thread Index | Old Index