[src/trunk]: src/usr.bin/make make(1): spell nonexistent consistently

[rillig <rillig%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/798f7df7e70f
branches:  trunk
changeset: 979167:798f7df7e70f
user:      rillig <rillig%NetBSD.org@localhost>
date:      Fri Dec 18 15:47:34 2020 +0000

description:
make(1): spell nonexistent consistently

diffstat:

 usr.bin/make/PSD.doc/tutorial.ms            |  10 +++++-----
 usr.bin/make/arch.c                         |   6 +++---
 usr.bin/make/make.c                         |  14 +++++++-------
 usr.bin/make/suff.c                         |   6 +++---
 usr.bin/make/targ.c                         |   6 +++---
 usr.bin/make/unit-tests/depsrc-optional.exp |  10 +++++-----
 6 files changed, 26 insertions(+), 26 deletions(-)

diffs (201 lines):

diff -r a2208fa30ee4 -r 798f7df7e70f usr.bin/make/PSD.doc/tutorial.ms
--- a/usr.bin/make/PSD.doc/tutorial.ms  Fri Dec 18 15:33:34 2020 +0000
+++ b/usr.bin/make/PSD.doc/tutorial.ms  Fri Dec 18 15:47:34 2020 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: tutorial.ms,v 1.13 2017/03/01 13:05:11 kre Exp $
+.\"    $NetBSD: tutorial.ms,v 1.14 2020/12/18 15:47:34 rillig Exp $
 .\" Copyright (c) 1988, 1989, 1993
 .\"    The Regents of the University of California.  All rights reserved.
 .\"
@@ -1918,15 +1918,15 @@
        applying .l -> .c to "jive.l"
 Suff_FindDeps (jive.l)
 Examining jive.l...modified 17:16:01 Oct 4, 1987...up-to-date
-Examining jive.c...non-existent...out-of-date
+Examining jive.c...nonexistent...out-of-date
 --- jive.c ---
 lex jive.l
 \&.\|.\|. meaningless lex output deleted .\|.\|.
 mv lex.yy.c jive.c
-Examining jive.o...non-existent...out-of-date
+Examining jive.o...nonexistent...out-of-date
 --- jive.o ---
 cc -c jive.c
-Examining jive.out...non-existent...out-of-date
+Examining jive.out...nonexistent...out-of-date
 --- jive.out ---
 cc -o jive.out jive.o
 .DE
@@ -2871,7 +2871,7 @@
 the directories each time, my experience suggests that the caching seldom
 causes problems. In addition, not caching the directories slows things
 down enormously because of PMake's attempts to apply transformation
-rules through non-existent files \*- the number of extra file-system
+rules through nonexistent files \*- the number of extra file-system
 searches is truly staggering, especially if many files without
 suffixes are used and the null suffix isn't changed from
 .CW .out .
diff -r a2208fa30ee4 -r 798f7df7e70f usr.bin/make/arch.c
--- a/usr.bin/make/arch.c       Fri Dec 18 15:33:34 2020 +0000
+++ b/usr.bin/make/arch.c       Fri Dec 18 15:47:34 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: arch.c,v 1.188 2020/12/13 20:14:48 rillig Exp $        */
+/*     $NetBSD: arch.c,v 1.189 2020/12/18 15:47:34 rillig Exp $        */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -125,7 +125,7 @@
 #include "config.h"
 
 /*     "@(#)arch.c     8.2 (Berkeley) 1/2/94"  */
-MAKE_RCSID("$NetBSD: arch.c,v 1.188 2020/12/13 20:14:48 rillig Exp $");
+MAKE_RCSID("$NetBSD: arch.c,v 1.189 2020/12/18 15:47:34 rillig Exp $");
 
 typedef struct List ArchList;
 typedef struct ListNode ArchListNode;
@@ -903,7 +903,7 @@
                gn->mtime = 0;
 }
 
-/* Given a non-existent archive member's node, update gn->mtime from its
+/* Given a nonexistent archive member's node, update gn->mtime from its
  * archived form, if it exists. */
 void
 Arch_UpdateMemberMTime(GNode *gn)
diff -r a2208fa30ee4 -r 798f7df7e70f usr.bin/make/make.c
--- a/usr.bin/make/make.c       Fri Dec 18 15:33:34 2020 +0000
+++ b/usr.bin/make/make.c       Fri Dec 18 15:47:34 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: make.c,v 1.230 2020/12/18 14:46:44 rillig Exp $        */
+/*     $NetBSD: make.c,v 1.231 2020/12/18 15:47:34 rillig Exp $        */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -102,7 +102,7 @@
 #include "job.h"
 
 /*     "@(#)make.c     8.1 (Berkeley) 6/6/93"  */
-MAKE_RCSID("$NetBSD: make.c,v 1.230 2020/12/18 14:46:44 rillig Exp $");
+MAKE_RCSID("$NetBSD: make.c,v 1.231 2020/12/18 15:47:34 rillig Exp $");
 
 /* Sequence # to detect recursion. */
 static unsigned int checked_seqno = 1;
@@ -202,7 +202,7 @@
        }
 
        if (gn->mtime == 0 && !(gn->type & OP_OPTIONAL)) {
-               DEBUG0(MAKE, "non-existent and no sources...");
+               DEBUG0(MAKE, "nonexistent and no sources...");
                return TRUE;
        }
 
@@ -241,7 +241,7 @@
                                debug_printf("modified %s...",
                                    Targ_FmtTime(gn->mtime));
                        else
-                               debug_printf("non-existent...");
+                               debug_printf("nonexistent...");
                }
        }
 
@@ -275,7 +275,7 @@
 
                /*
                 * always out of date if no children and :: target
-                * or non-existent.
+                * or nonexistent.
                 */
                oodate = (gn->mtime == 0 || Arch_LibOODate(gn) ||
                          (gn->youngestChild == NULL &&
@@ -309,10 +309,10 @@
                oodate = TRUE;
        } else {
                /*
-                * When a non-existing child with no sources
+                * When a nonexistent child with no sources
                 * (such as a typically used FORCE source) has been made and
                 * the target of the child (usually a directory) has the same
-                * timestamp as the timestamp just given to the non-existing
+                * timestamp as the timestamp just given to the nonexistent
                 * child after it was considered made.
                 */
                if (DEBUG(MAKE)) {
diff -r a2208fa30ee4 -r 798f7df7e70f usr.bin/make/suff.c
--- a/usr.bin/make/suff.c       Fri Dec 18 15:33:34 2020 +0000
+++ b/usr.bin/make/suff.c       Fri Dec 18 15:47:34 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: suff.c,v 1.330 2020/12/13 20:14:48 rillig Exp $        */
+/*     $NetBSD: suff.c,v 1.331 2020/12/18 15:47:34 rillig Exp $        */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -114,7 +114,7 @@
 #include "dir.h"
 
 /*     "@(#)suff.c     8.4 (Berkeley) 3/21/94" */
-MAKE_RCSID("$NetBSD: suff.c,v 1.330 2020/12/13 20:14:48 rillig Exp $");
+MAKE_RCSID("$NetBSD: suff.c,v 1.331 2020/12/18 15:47:34 rillig Exp $");
 
 typedef List SuffixList;
 typedef ListNode SuffixListNode;
@@ -2012,7 +2012,7 @@
  * is set for the given node and all its implied children.
  *
  * The path found by this target is the shortest path in the transformation
- * graph, which may pass through non-existent targets, to an existing target.
+ * graph, which may pass through nonexistent targets, to an existing target.
  * The search continues on all paths from the root suffix until a file is
  * found. I.e. if there's a path .o -> .c -> .l -> .l,v from the root and the
  * .l,v file exists but the .c and .l files don't, the search will branch out
diff -r a2208fa30ee4 -r 798f7df7e70f usr.bin/make/targ.c
--- a/usr.bin/make/targ.c       Fri Dec 18 15:33:34 2020 +0000
+++ b/usr.bin/make/targ.c       Fri Dec 18 15:47:34 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: targ.c,v 1.158 2020/12/18 14:46:44 rillig Exp $        */
+/*     $NetBSD: targ.c,v 1.159 2020/12/18 15:47:34 rillig Exp $        */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -113,7 +113,7 @@
 #include "dir.h"
 
 /*     "@(#)targ.c     8.2 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: targ.c,v 1.158 2020/12/18 14:46:44 rillig Exp $");
+MAKE_RCSID("$NetBSD: targ.c,v 1.159 2020/12/18 15:47:34 rillig Exp $");
 
 /*
  * All target nodes that appeared on the left-hand side of one of the
@@ -507,7 +507,7 @@
                                    Targ_FmtTime(gn->mtime),
                                    made_name(gn->made));
                        } else if (gn->made != UNMADE) {
-                               debug_printf("# non-existent (maybe): %s\n",
+                               debug_printf("# nonexistent (maybe): %s\n",
                                    made_name(gn->made));
                        } else
                                debug_printf("# unmade\n");
diff -r a2208fa30ee4 -r 798f7df7e70f usr.bin/make/unit-tests/depsrc-optional.exp
--- a/usr.bin/make/unit-tests/depsrc-optional.exp       Fri Dec 18 15:33:34 2020 +0000
+++ b/usr.bin/make/unit-tests/depsrc-optional.exp       Fri Dec 18 15:47:34 2020 +0000
@@ -5,16 +5,16 @@
 ExamineLater: need to examine "optional-cohort"
 Make_ExpandUse: examine optional
 Make_ExpandUse: examine optional-cohort
-Examining optional...non-existent...up-to-date.
-Examining optional-cohort...non-existent...:: operator and no sources...out-of-date.
+Examining optional...nonexistent...up-to-date.
+Examining optional-cohort...nonexistent...:: operator and no sources...out-of-date.
 : A leaf node using '::' is considered out-of-date.
  recheck(optional-cohort): update time from nonexistent to now
-Examining important...non-existent...modified before source "optional-cohort"...out-of-date.
+Examining important...nonexistent...modified before source "optional-cohort"...out-of-date.
 : important is made.
  recheck(important): update time from nonexistent to now
-Examining all...non-existent...modified before source "important"...out-of-date.
+Examining all...nonexistent...modified before source "important"...out-of-date.
 : all is made.
  recheck(all): update time from nonexistent to now
-Examining .END...non-existent...non-existent and no sources...out-of-date.
+Examining .END...nonexistent...nonexistent and no sources...out-of-date.
  recheck(.END): update time from nonexistent to now
 exit status 0