Module Name: src
Committed By: rillig
Date: Sun Nov 8 08:33:07 UTC 2020
Modified Files:
src/usr.bin/make: arch.c compat.c make.c make.h
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.171 -r1.172 src/usr.bin/make/arch.c
cvs rdiff -u -r1.180 -r1.181 src/usr.bin/make/compat.c
cvs rdiff -u -r1.189 -r1.190 src/usr.bin/make/make.c
cvs rdiff -u -r1.199 -r1.200 src/usr.bin/make/make.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/arch.c
diff -u src/usr.bin/make/arch.c:1.171 src/usr.bin/make/arch.c:1.172
--- src/usr.bin/make/arch.c:1.171 Sat Nov 7 14:04:49 2020
+++ src/usr.bin/make/arch.c Sun Nov 8 08:33:07 2020
@@ -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 @@ Arch_FindLib(GNode *gn, SearchPath *path
}
/* 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
Index: src/usr.bin/make/compat.c
diff -u src/usr.bin/make/compat.c:1.180 src/usr.bin/make/compat.c:1.181
--- src/usr.bin/make/compat.c:1.180 Sun Nov 8 08:26:22 2020
+++ src/usr.bin/make/compat.c Sun Nov 8 08:33:07 2020
@@ -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 @@ Compat_Make(GNode *gn, GNode *pgn)
* 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;
Index: src/usr.bin/make/make.c
diff -u src/usr.bin/make/make.c:1.189 src/usr.bin/make/make.c:1.190
--- src/usr.bin/make/make.c:1.189 Sun Nov 8 08:26:22 2020
+++ src/usr.bin/make/make.c Sun Nov 8 08:33:07 2020
@@ -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 @@ GNode_UpdateYoungestChild(GNode *gn, GNo
* may be changed.
*/
Boolean
-Make_OODate(GNode *gn)
+GNode_IsOODate(GNode *gn)
{
Boolean oodate;
@@ -962,7 +962,7 @@ MakeStartJobs(void)
}
gn->made = BEINGMADE;
- if (Make_OODate(gn)) {
+ if (GNode_IsOODate(gn)) {
DEBUG0(MAKE, "out-of-date\n");
if (opts.queryFlag) {
return TRUE;
Index: src/usr.bin/make/make.h
diff -u src/usr.bin/make/make.h:1.199 src/usr.bin/make/make.h:1.200
--- src/usr.bin/make/make.h:1.199 Sun Nov 8 08:26:22 2020
+++ src/usr.bin/make/make.h Sun Nov 8 08:33:07 2020
@@ -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 @@ typedef struct GNode {
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 @@ extern CmdOpts opts;
#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 *);
