Source-Changes-HG archive

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

[src/trunk]: src/usr.bin/make make(1): rename Make_OODate to GNode_IsOODate



details:   https://anonhg.NetBSD.org/src/rev/df8f9194d143
branches:  trunk
changeset: 945836:df8f9194d143
user:      rillig <rillig%NetBSD.org@localhost>
date:      Sun Nov 08 08:33:07 2020 +0000

description:
make(1): rename Make_OODate to GNode_IsOODate

It doesn't matter which of the make modules is in charge of determining
whether a node is out-of-date.  Therefore, remove the module name from
the function name.

diffstat:

 usr.bin/make/arch.c   |   6 +++---
 usr.bin/make/compat.c |   8 ++++----
 usr.bin/make/make.c   |  10 +++++-----
 usr.bin/make/make.h   |   6 +++---
 4 files changed, 15 insertions(+), 15 deletions(-)

diffs (130 lines):

diff -r 47c5aaea5938 -r df8f9194d143 usr.bin/make/arch.c
--- a/usr.bin/make/arch.c       Sun Nov 08 08:26:22 2020 +0000
+++ b/usr.bin/make/arch.c       Sun Nov 08 08:33:07 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: arch.c,v 1.171 2020/11/07 14:04:49 rillig Exp $        */
+/*     $NetBSD: arch.c,v 1.172 2020/11/08 08:33:07 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.171 2020/11/07 14:04:49 rillig Exp $");
+MAKE_RCSID("$NetBSD: arch.c,v 1.172 2020/11/08 08:33:07 rillig Exp $");
 
 typedef struct List ArchList;
 typedef struct ListNode ArchListNode;
@@ -974,7 +974,7 @@
 }
 
 /* Decide if a node with the OP_LIB attribute is out-of-date. Called from
- * Make_OODate to make its life easier.
+ * GNode_IsOODate to make its life easier.
  * The library is cached if it hasn't been already.
  *
  * There are several ways for a library to be out-of-date that are
diff -r 47c5aaea5938 -r df8f9194d143 usr.bin/make/compat.c
--- a/usr.bin/make/compat.c     Sun Nov 08 08:26:22 2020 +0000
+++ b/usr.bin/make/compat.c     Sun Nov 08 08:33:07 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: compat.c,v 1.180 2020/11/08 08:26:22 rillig Exp $      */
+/*     $NetBSD: compat.c,v 1.181 2020/11/08 08:33:07 rillig Exp $      */
 
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -96,7 +96,7 @@
 #include "pathnames.h"
 
 /*     "@(#)compat.c   8.2 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: compat.c,v 1.180 2020/11/08 08:26:22 rillig Exp $");
+MAKE_RCSID("$NetBSD: compat.c,v 1.181 2020/11/08 08:33:07 rillig Exp $");
 
 static GNode *curTarg = NULL;
 static pid_t compatChild;
@@ -497,10 +497,10 @@
         * All the children were made ok. Now youngestChild->mtime contains the
         * modification time of the newest child, we need to find out if we
         * exist and when we were modified last. The criteria for datedness
-        * are defined by the Make_OODate function.
+        * are defined by GNode_IsOODate.
         */
        DEBUG1(MAKE, "Examining %s...", gn->name);
-       if (!Make_OODate(gn)) {
+       if (!GNode_IsOODate(gn)) {
            gn->made = UPTODATE;
            DEBUG0(MAKE, "up-to-date.\n");
            goto cohorts;
diff -r 47c5aaea5938 -r df8f9194d143 usr.bin/make/make.c
--- a/usr.bin/make/make.c       Sun Nov 08 08:26:22 2020 +0000
+++ b/usr.bin/make/make.c       Sun Nov 08 08:33:07 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: make.c,v 1.189 2020/11/08 08:26:22 rillig Exp $        */
+/*     $NetBSD: make.c,v 1.190 2020/11/08 08:33:07 rillig Exp $        */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -95,7 +95,7 @@
  *                     sure that any variable that needs to exist
  *                     at the very least has the empty value.
  *
- *     Make_OODate     Determine if a target is out-of-date.
+ *     GNode_IsOODate  Determine if a target is out-of-date.
  *
  *     Make_HandleUse  See if a child is a .USE node for a parent
  *                     and perform the .USE actions if so.
@@ -108,7 +108,7 @@
 #include "job.h"
 
 /*     "@(#)make.c     8.1 (Berkeley) 6/6/93"  */
-MAKE_RCSID("$NetBSD: make.c,v 1.189 2020/11/08 08:26:22 rillig Exp $");
+MAKE_RCSID("$NetBSD: make.c,v 1.190 2020/11/08 08:33:07 rillig Exp $");
 
 /* Sequence # to detect recursion. */
 static unsigned int checked = 1;
@@ -204,7 +204,7 @@
  * may be changed.
  */
 Boolean
-Make_OODate(GNode *gn)
+GNode_IsOODate(GNode *gn)
 {
     Boolean         oodate;
 
@@ -962,7 +962,7 @@
        }
 
        gn->made = BEINGMADE;
-       if (Make_OODate(gn)) {
+       if (GNode_IsOODate(gn)) {
            DEBUG0(MAKE, "out-of-date\n");
            if (opts.queryFlag) {
                return TRUE;
diff -r 47c5aaea5938 -r df8f9194d143 usr.bin/make/make.h
--- a/usr.bin/make/make.h       Sun Nov 08 08:26:22 2020 +0000
+++ b/usr.bin/make/make.h       Sun Nov 08 08:33:07 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: make.h,v 1.199 2020/11/08 08:26:22 rillig Exp $        */
+/*     $NetBSD: make.h,v 1.200 2020/11/08 08:33:07 rillig Exp $        */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -324,7 +324,7 @@
     int unmade;                        /* The number of unmade children */
 
     /* The modification time; 0 means the node does not have a corresponding
-     * file; see Make_OODate. */
+     * file; see GNode_IsOODate. */
     time_t mtime;
     struct GNode *youngestChild;
 
@@ -637,7 +637,7 @@
 #include "nonints.h"
 
 void GNode_UpdateYoungestChild(GNode *, GNode *);
-Boolean Make_OODate(GNode *);
+Boolean GNode_IsOODate(GNode *);
 void Make_ExpandUse(GNodeList *);
 time_t Make_Recheck(GNode *);
 void Make_HandleUse(GNode *, GNode *);



Home | Main Index | Thread Index | Old Index