Module Name: src
Committed By: rillig
Date: Fri Nov 6 23:59:22 UTC 2020
Modified Files:
src/usr.bin/make: arch.c dir.c nonints.h
Log Message:
make(1): rename Arch_MemMTime to Arch_MemberMTime
The abbreviation Mem was ambiguous, it could have meant memory as well.
To generate a diff of this commit:
cvs rdiff -u -r1.154 -r1.155 src/usr.bin/make/arch.c
cvs rdiff -u -r1.194 -r1.195 src/usr.bin/make/dir.c
cvs rdiff -u -r1.150 -r1.151 src/usr.bin/make/nonints.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.154 src/usr.bin/make/arch.c:1.155
--- src/usr.bin/make/arch.c:1.154 Thu Nov 5 17:27:16 2020
+++ src/usr.bin/make/arch.c Fri Nov 6 23:59:21 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: arch.c,v 1.154 2020/11/05 17:27:16 rillig Exp $ */
+/* $NetBSD: arch.c,v 1.155 2020/11/06 23:59:21 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -130,7 +130,7 @@
#include "config.h"
/* "@(#)arch.c 8.2 (Berkeley) 1/2/94" */
-MAKE_RCSID("$NetBSD: arch.c,v 1.154 2020/11/05 17:27:16 rillig Exp $");
+MAKE_RCSID("$NetBSD: arch.c,v 1.155 2020/11/06 23:59:21 rillig Exp $");
#ifdef TARGET_MACHINE
#undef MAKE_MACHINE
@@ -930,7 +930,7 @@ Arch_MTime(GNode *gn)
/* Given a non-existent archive member's node, get its modification time from
* its archived form, if it exists. gn->mtime is filled in as well. */
time_t
-Arch_MemMTime(GNode *gn)
+Arch_MemberMTime(GNode *gn)
{
GNodeListNode *ln;
Index: src/usr.bin/make/dir.c
diff -u src/usr.bin/make/dir.c:1.194 src/usr.bin/make/dir.c:1.195
--- src/usr.bin/make/dir.c:1.194 Thu Nov 5 17:27:16 2020
+++ src/usr.bin/make/dir.c Fri Nov 6 23:59:21 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: dir.c,v 1.194 2020/11/05 17:27:16 rillig Exp $ */
+/* $NetBSD: dir.c,v 1.195 2020/11/06 23:59:21 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -134,7 +134,7 @@
#include "job.h"
/* "@(#)dir.c 8.2 (Berkeley) 1/2/94" */
-MAKE_RCSID("$NetBSD: dir.c,v 1.194 2020/11/05 17:27:16 rillig Exp $");
+MAKE_RCSID("$NetBSD: dir.c,v 1.195 2020/11/06 23:59:21 rillig Exp $");
#define DIR_DEBUG0(text) DEBUG0(DIR, text)
#define DIR_DEBUG1(fmt, arg1) DEBUG1(DIR, fmt, arg1)
@@ -1352,7 +1352,7 @@ Dir_MTime(GNode *gn, Boolean recheck)
if (gn->type & OP_MEMBER) {
if (fullName != gn->path)
free(fullName);
- return Arch_MemMTime(gn);
+ return Arch_MemberMTime(gn);
} else {
mst.mst_mtime = 0;
}
Index: src/usr.bin/make/nonints.h
diff -u src/usr.bin/make/nonints.h:1.150 src/usr.bin/make/nonints.h:1.151
--- src/usr.bin/make/nonints.h:1.150 Fri Nov 6 23:11:11 2020
+++ src/usr.bin/make/nonints.h Fri Nov 6 23:59:21 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: nonints.h,v 1.150 2020/11/06 23:11:11 rillig Exp $ */
+/* $NetBSD: nonints.h,v 1.151 2020/11/06 23:59:21 rillig Exp $ */
/*-
* Copyright (c) 1988, 1989, 1990, 1993
@@ -80,7 +80,7 @@ Boolean Arch_ParseArchive(char **, GNode
void Arch_Touch(GNode *);
void Arch_TouchLib(GNode *);
time_t Arch_MTime(GNode *);
-time_t Arch_MemMTime(GNode *);
+time_t Arch_MemberMTime(GNode *);
void Arch_FindLib(GNode *, SearchPath *);
Boolean Arch_LibOODate(GNode *);
Boolean Arch_IsLib(GNode *);
