Module Name: src
Committed By: rillig
Date: Thu Feb 4 21:50:39 UTC 2021
Modified Files:
src/usr.bin/make: make.h nonints.h var.c
Log Message:
make: rename Var_ValueDirect to GNode_ValueDirect
To generate a diff of this commit:
cvs rdiff -u -r1.253 -r1.254 src/usr.bin/make/make.h
cvs rdiff -u -r1.199 -r1.200 src/usr.bin/make/nonints.h
cvs rdiff -u -r1.802 -r1.803 src/usr.bin/make/var.c
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/make.h
diff -u src/usr.bin/make/make.h:1.253 src/usr.bin/make/make.h:1.254
--- src/usr.bin/make/make.h:1.253 Thu Feb 4 21:42:46 2021
+++ src/usr.bin/make/make.h Thu Feb 4 21:50:39 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: make.h,v 1.253 2021/02/04 21:42:46 rillig Exp $ */
+/* $NetBSD: make.h,v 1.254 2021/02/04 21:50:39 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -751,19 +751,19 @@ GNode_IsError(const GNode *gn)
}
MAKE_INLINE const char *
-GNode_VarTarget(GNode *gn) { return Var_ValueDirect(TARGET, gn); }
+GNode_VarTarget(GNode *gn) { return GNode_ValueDirect(gn, TARGET); }
MAKE_INLINE const char *
-GNode_VarOodate(GNode *gn) { return Var_ValueDirect(OODATE, gn); }
+GNode_VarOodate(GNode *gn) { return GNode_ValueDirect(gn, OODATE); }
MAKE_INLINE const char *
-GNode_VarAllsrc(GNode *gn) { return Var_ValueDirect(ALLSRC, gn); }
+GNode_VarAllsrc(GNode *gn) { return GNode_ValueDirect(gn, ALLSRC); }
MAKE_INLINE const char *
-GNode_VarImpsrc(GNode *gn) { return Var_ValueDirect(IMPSRC, gn); }
+GNode_VarImpsrc(GNode *gn) { return GNode_ValueDirect(gn, IMPSRC); }
MAKE_INLINE const char *
-GNode_VarPrefix(GNode *gn) { return Var_ValueDirect(PREFIX, gn); }
+GNode_VarPrefix(GNode *gn) { return GNode_ValueDirect(gn, PREFIX); }
MAKE_INLINE const char *
-GNode_VarArchive(GNode *gn) { return Var_ValueDirect(ARCHIVE, gn); }
+GNode_VarArchive(GNode *gn) { return GNode_ValueDirect(gn, ARCHIVE); }
MAKE_INLINE const char *
-GNode_VarMember(GNode *gn) { return Var_ValueDirect(MEMBER, gn); }
+GNode_VarMember(GNode *gn) { return GNode_ValueDirect(gn, MEMBER); }
#ifdef __GNUC__
#define UNCONST(ptr) ({ \
Index: src/usr.bin/make/nonints.h
diff -u src/usr.bin/make/nonints.h:1.199 src/usr.bin/make/nonints.h:1.200
--- src/usr.bin/make/nonints.h:1.199 Thu Feb 4 20:14:33 2021
+++ src/usr.bin/make/nonints.h Thu Feb 4 21:50:39 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: nonints.h,v 1.199 2021/02/04 20:14:33 rillig Exp $ */
+/* $NetBSD: nonints.h,v 1.200 2021/02/04 21:50:39 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -380,7 +380,7 @@ void Var_AppendExpand(const char *, cons
Boolean Var_Exists(const char *, GNode *);
Boolean Var_ExistsExpand(const char *, GNode *);
FStr Var_Value(const char *, GNode *);
-const char *Var_ValueDirect(const char *, GNode *);
+const char *GNode_ValueDirect(GNode *, const char *);
VarParseResult Var_Parse(const char **, GNode *, VarEvalFlags, FStr *);
VarParseResult Var_Subst(const char *, GNode *, VarEvalFlags, char **);
void Var_Stats(void);
Index: src/usr.bin/make/var.c
diff -u src/usr.bin/make/var.c:1.802 src/usr.bin/make/var.c:1.803
--- src/usr.bin/make/var.c:1.802 Thu Feb 4 21:42:46 2021
+++ src/usr.bin/make/var.c Thu Feb 4 21:50:39 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.802 2021/02/04 21:42:46 rillig Exp $ */
+/* $NetBSD: var.c,v 1.803 2021/02/04 21:50:39 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -139,7 +139,7 @@
#include "metachar.h"
/* "@(#)var.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.802 2021/02/04 21:42:46 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.803 2021/02/04 21:50:39 rillig Exp $");
typedef enum VarFlags {
VAR_NONE = 0,
@@ -1228,9 +1228,9 @@ Var_Value(const char *name, GNode *scope
* up the variable in any other scope.
*/
const char *
-Var_ValueDirect(const char *name, GNode *scope)
+GNode_ValueDirect(GNode *gn, const char *name)
{
- Var *v = VarFind(name, scope, FALSE);
+ Var *v = VarFind(name, gn, FALSE);
return v != NULL ? v->val.data : NULL;
}
