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 Lst_Datum to LstNode_Datum
details: https://anonhg.NetBSD.org/src/rev/2bb793a94b41
branches: trunk
changeset: 943300:2bb793a94b41
user: rillig <rillig%NetBSD.org@localhost>
date: Sun Aug 30 11:15:05 2020 +0000
description:
make(1): rename Lst_Datum to LstNode_Datum
diffstat:
usr.bin/make/arch.c | 10 ++++----
usr.bin/make/dir.c | 32 +++++++++++++++---------------
usr.bin/make/lst.c | 8 +++---
usr.bin/make/lst.h | 4 +-
usr.bin/make/main.c | 14 ++++++------
usr.bin/make/make.c | 14 ++++++------
usr.bin/make/meta.c | 8 +++---
usr.bin/make/parse.c | 10 ++++----
usr.bin/make/suff.c | 54 ++++++++++++++++++++++++++--------------------------
usr.bin/make/targ.c | 12 +++++-----
10 files changed, 83 insertions(+), 83 deletions(-)
diffs (truncated from 731 to 300 lines):
diff -r e1274fb32a32 -r 2bb793a94b41 usr.bin/make/arch.c
--- a/usr.bin/make/arch.c Sun Aug 30 11:12:05 2020 +0000
+++ b/usr.bin/make/arch.c Sun Aug 30 11:15:05 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: arch.c,v 1.106 2020/08/29 13:38:48 rillig Exp $ */
+/* $NetBSD: arch.c,v 1.107 2020/08/30 11:15:05 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: arch.c,v 1.106 2020/08/29 13:38:48 rillig Exp $";
+static char rcsid[] = "$NetBSD: arch.c,v 1.107 2020/08/30 11:15:05 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)arch.c 8.2 (Berkeley) 1/2/94";
#else
-__RCSID("$NetBSD: arch.c,v 1.106 2020/08/29 13:38:48 rillig Exp $");
+__RCSID("$NetBSD: arch.c,v 1.107 2020/08/30 11:15:05 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -508,7 +508,7 @@
ln = Lst_Find(archives, ArchFindArchive, archive);
if (ln != NULL) {
- ar = Lst_Datum(ln);
+ ar = LstNode_Datum(ln);
he = Hash_FindEntry(&ar->members, member);
@@ -1046,7 +1046,7 @@
Lst_Open(gn->parents);
while ((ln = Lst_Next(gn->parents)) != NULL) {
- pgn = Lst_Datum(ln);
+ pgn = LstNode_Datum(ln);
if (pgn->type & OP_ARCHV) {
/*
diff -r e1274fb32a32 -r 2bb793a94b41 usr.bin/make/dir.c
--- a/usr.bin/make/dir.c Sun Aug 30 11:12:05 2020 +0000
+++ b/usr.bin/make/dir.c Sun Aug 30 11:15:05 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dir.c,v 1.125 2020/08/30 11:12:05 rillig Exp $ */
+/* $NetBSD: dir.c,v 1.126 2020/08/30 11:15:05 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -70,14 +70,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: dir.c,v 1.125 2020/08/30 11:12:05 rillig Exp $";
+static char rcsid[] = "$NetBSD: dir.c,v 1.126 2020/08/30 11:15:05 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)dir.c 8.2 (Berkeley) 1/2/94";
#else
-__RCSID("$NetBSD: dir.c,v 1.125 2020/08/30 11:12:05 rillig Exp $");
+__RCSID("$NetBSD: dir.c,v 1.126 2020/08/30 11:15:05 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -462,7 +462,7 @@
Lst_Open(dirSearchPath);
if ((ln = Lst_First(dirSearchPath)) != NULL) {
- p = Lst_Datum(ln);
+ p = LstNode_Datum(ln);
if (p == dotLast) {
hasLastDot = TRUE;
Var_Append(".PATH", dotLast->name, VAR_GLOBAL);
@@ -477,7 +477,7 @@
}
while ((ln = Lst_Next(dirSearchPath)) != NULL) {
- p = Lst_Datum(ln);
+ p = LstNode_Datum(ln);
if (p == dotLast)
continue;
if (p == dot && hasLastDot)
@@ -753,7 +753,7 @@
Lst_Open(path);
while ((ln = Lst_Next(path)) != NULL) {
- Path *p = Lst_Datum(ln);
+ Path *p = LstNode_Datum(ln);
DirMatchFiles(word, p, expansions);
}
Lst_Close(path);
@@ -1094,7 +1094,7 @@
Lst_Open(path);
if ((ln = Lst_First(path)) != NULL) {
- p = Lst_Datum(ln);
+ p = LstNode_Datum(ln);
if (p == dotLast) {
hasLastDot = TRUE;
DIR_DEBUG0("[dot last]...");
@@ -1128,7 +1128,7 @@
}
while ((ln = Lst_Next(path)) != NULL) {
- p = Lst_Datum(ln);
+ p = LstNode_Datum(ln);
if (p == dotLast)
continue;
if ((file = DirLookup(p, name, cp, hasSlash)) != NULL) {
@@ -1186,7 +1186,7 @@
Lst_Open(path);
while ((ln = Lst_Next(path)) != NULL) {
- p = Lst_Datum(ln);
+ p = LstNode_Datum(ln);
if (p == dotLast)
continue;
if (p == dot) {
@@ -1244,7 +1244,7 @@
Lst_Open(path);
while ((ln = Lst_Next(path)) != NULL) {
- p = Lst_Datum(ln);
+ p = LstNode_Datum(ln);
if (p == dotLast)
continue;
if ((file = DirLookupAbs(p, name, cp)) != NULL) {
@@ -1299,7 +1299,7 @@
if (ln == NULL) {
return NULL;
} else {
- p = Lst_Datum(ln);
+ p = LstNode_Datum(ln);
}
if (Hash_FindEntry(&p->files, cp) != NULL) {
@@ -1523,7 +1523,7 @@
if (path != NULL && strcmp(name, ".DOTLAST") == 0) {
ln = Lst_Find(path, DirFindName, name);
if (ln != NULL)
- return Lst_Datum(ln);
+ return LstNode_Datum(ln);
dotLast->refCount++;
Lst_Prepend(path, dotLast);
@@ -1532,7 +1532,7 @@
if (path != NULL)
ln = Lst_Find(openDirectories, DirFindName, name);
if (ln != NULL) {
- p = Lst_Datum(ln);
+ p = LstNode_Datum(ln);
if (Lst_FindDatum(path, p) == NULL) {
p->refCount += 1;
Lst_Append(path, p);
@@ -1621,7 +1621,7 @@
if (path != NULL) {
Lst_Open(path);
while ((ln = Lst_Next(path)) != NULL) {
- Path *p = Lst_Datum(ln);
+ Path *p = LstNode_Datum(ln);
Buf_AddStr(&buf, " ");
Buf_AddStr(&buf, flag);
Buf_AddStr(&buf, p->name);
@@ -1720,7 +1720,7 @@
Path *p;
for (ln = Lst_First(path2); ln != NULL; ln = LstNode_Next(ln)) {
- p = Lst_Datum(ln);
+ p = LstNode_Datum(ln);
if (Lst_FindDatum(path1, p) == NULL) {
p->refCount += 1;
Lst_Append(path1, p);
@@ -1749,7 +1749,7 @@
Lst_Open(openDirectories);
while ((ln = Lst_Next(openDirectories)) != NULL) {
- Path *p = Lst_Datum(ln);
+ Path *p = LstNode_Datum(ln);
fprintf(debug_file, "# %-20s %10d\t%4d\n", p->name, p->refCount,
p->hits);
}
diff -r e1274fb32a32 -r 2bb793a94b41 usr.bin/make/lst.c
--- a/usr.bin/make/lst.c Sun Aug 30 11:12:05 2020 +0000
+++ b/usr.bin/make/lst.c Sun Aug 30 11:15:05 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: lst.c,v 1.57 2020/08/30 11:12:05 rillig Exp $ */
+/* $NetBSD: lst.c,v 1.58 2020/08/30 11:15:05 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -37,11 +37,11 @@
#include "make.h"
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: lst.c,v 1.57 2020/08/30 11:12:05 rillig Exp $";
+static char rcsid[] = "$NetBSD: lst.c,v 1.58 2020/08/30 11:15:05 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: lst.c,v 1.57 2020/08/30 11:12:05 rillig Exp $");
+__RCSID("$NetBSD: lst.c,v 1.58 2020/08/30 11:15:05 rillig Exp $");
#endif /* not lint */
#endif
@@ -355,7 +355,7 @@
/* Return the datum stored in the given node. */
void *
-Lst_Datum(LstNode node)
+LstNode_Datum(LstNode node)
{
assert(node != NULL);
return node->datum;
diff -r e1274fb32a32 -r 2bb793a94b41 usr.bin/make/lst.h
--- a/usr.bin/make/lst.h Sun Aug 30 11:12:05 2020 +0000
+++ b/usr.bin/make/lst.h Sun Aug 30 11:15:05 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: lst.h,v 1.58 2020/08/30 11:12:06 rillig Exp $ */
+/* $NetBSD: lst.h,v 1.59 2020/08/30 11:15:05 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -139,7 +139,7 @@
/* Return predecessor to given element */
LstNode LstNode_Prev(LstNode);
/* Get datum from LstNode */
-void *Lst_Datum(LstNode);
+void *LstNode_Datum(LstNode);
/*
* Functions for entire lists
diff -r e1274fb32a32 -r 2bb793a94b41 usr.bin/make/main.c
--- a/usr.bin/make/main.c Sun Aug 30 11:12:05 2020 +0000
+++ b/usr.bin/make/main.c Sun Aug 30 11:15:05 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.329 2020/08/29 13:16:54 rillig Exp $ */
+/* $NetBSD: main.c,v 1.330 2020/08/30 11:15:05 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,7 +69,7 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: main.c,v 1.329 2020/08/29 13:16:54 rillig Exp $";
+static char rcsid[] = "$NetBSD: main.c,v 1.330 2020/08/30 11:15:05 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
@@ -81,7 +81,7 @@
#if 0
static char sccsid[] = "@(#)main.c 8.3 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: main.c,v 1.329 2020/08/29 13:16:54 rillig Exp $");
+__RCSID("$NetBSD: main.c,v 1.330 2020/08/30 11:15:05 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -874,7 +874,7 @@
expandVars = getBoolean(".MAKE.EXPAND_VARIABLES", FALSE);
for (ln = Lst_First(variables); ln != NULL; ln = LstNode_Next(ln)) {
- char *var = Lst_Datum(ln);
+ char *var = LstNode_Datum(ln);
const char *value;
char *p1;
@@ -1283,7 +1283,7 @@
LstNode ln;
for (ln = Lst_First(create); ln != NULL; ln = LstNode_Next(ln)) {
- char *name = Lst_Datum(ln);
+ char *name = LstNode_Datum(ln);
Var_Append(".TARGETS", name, VAR_GLOBAL);
}
} else
@@ -1338,7 +1338,7 @@
ln = Lst_Find(sysMkPath, ReadMakefileSucceeded, NULL);
if (ln == NULL)
Fatal("%s: cannot open %s.", progname,
- (char *)Lst_Datum(Lst_First(sysMkPath)));
+ (char *)LstNode_Datum(Lst_First(sysMkPath)));
}
if (!Lst_IsEmpty(makefiles)) {
@@ -1347,7 +1347,7 @@
ln = Lst_Find(makefiles, ReadMakefileFailed, NULL);
if (ln != NULL)
Fatal("%s: cannot open %s.", progname,
- (char *)Lst_Datum(ln));
+ (char *)LstNode_Datum(ln));
} else {
p1 = Var_Subst("${" MAKEFILE_PREFERENCE "}",
VAR_CMD, VARE_WANTRES);
Home |
Main Index |
Thread Index |
Old Index