summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorrillig <rillig@NetBSD.org>2020-11-06 23:59:21 +0000
committerrillig <rillig@NetBSD.org>2020-11-06 23:59:21 +0000
commit730d8400334a754c79371856ea4b658cd09cd52e (patch)
tree122461ee5a093fd00a5738196e209e658cd4a0ef /usr.bin
parent658f2fd3d8d05c5ad87f73ea2621af34640e8132 (diff)
make(1): rename Arch_MemMTime to Arch_MemberMTime
The abbreviation Mem was ambiguous, it could have meant memory as well.
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/make/arch.c6
-rw-r--r--usr.bin/make/dir.c6
-rw-r--r--usr.bin/make/nonints.h4
3 files changed, 8 insertions, 8 deletions
diff --git a/usr.bin/make/arch.c b/usr.bin/make/arch.c
index 60a550db5a8..39350334cf5 100644
--- a/usr.bin/make/arch.c
+++ b/usr.bin/make/arch.c
@@ -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;
diff --git a/usr.bin/make/dir.c b/usr.bin/make/dir.c
index 93ee3f80308..78a252a6bf8 100644
--- a/usr.bin/make/dir.c
+++ b/usr.bin/make/dir.c
@@ -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;
}
diff --git a/usr.bin/make/nonints.h b/usr.bin/make/nonints.h
index 486d153be55..7495e82bbab 100644
--- a/usr.bin/make/nonints.h
+++ b/usr.bin/make/nonints.h
@@ -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 **, GNodeList *, 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 *);