Module Name: src
Committed By: rillig
Date: Sat Jan 29 01:07:32 UTC 2022
Modified Files:
src/usr.bin/make: make.h parse.c var.c
Log Message:
make: inline functions that have a single call site
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.291 -r1.292 src/usr.bin/make/make.h
cvs rdiff -u -r1.657 -r1.658 src/usr.bin/make/parse.c
cvs rdiff -u -r1.1006 -r1.1007 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.291 src/usr.bin/make/make.h:1.292
--- src/usr.bin/make/make.h:1.291 Thu Jan 27 06:02:59 2022
+++ src/usr.bin/make/make.h Sat Jan 29 01:07:31 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: make.h,v 1.291 2022/01/27 06:02:59 sjg Exp $ */
+/* $NetBSD: make.h,v 1.292 2022/01/29 01:07:31 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -987,7 +987,6 @@ void Var_Undef(const char *);
void Var_Set(GNode *, const char *, const char *);
void Var_SetExpand(GNode *, const char *, const char *);
void Var_SetWithFlags(GNode *, const char *, const char *, VarSetFlags);
-void Var_SetExpandWithFlags(GNode *, const char *, const char *, VarSetFlags);
void Var_Append(GNode *, const char *, const char *);
void Var_AppendExpand(GNode *, const char *, const char *);
bool Var_Exists(GNode *, const char *) MAKE_ATTR_USE;
Index: src/usr.bin/make/parse.c
diff -u src/usr.bin/make/parse.c:1.657 src/usr.bin/make/parse.c:1.658
--- src/usr.bin/make/parse.c:1.657 Thu Jan 27 10:34:55 2022
+++ src/usr.bin/make/parse.c Sat Jan 29 01:07:31 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.657 2022/01/27 10:34:55 rillig Exp $ */
+/* $NetBSD: parse.c,v 1.658 2022/01/29 01:07:31 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -106,7 +106,7 @@
#include "pathnames.h"
/* "@(#)parse.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: parse.c,v 1.657 2022/01/27 10:34:55 rillig Exp $");
+MAKE_RCSID("$NetBSD: parse.c,v 1.658 2022/01/29 01:07:31 rillig Exp $");
/*
* A file being read.
@@ -188,7 +188,7 @@ typedef struct VarAssign {
} VarAssign;
static bool Parse_IsVar(const char *, VarAssign *);
-static void Parse_Var_Keep(VarAssign *, GNode *);
+static void Parse_Var(VarAssign *, GNode *);
/*
* The target to be made if no targets are specified in the command line.
@@ -1282,18 +1282,12 @@ ParseDependencySourcesSpecial(char *star
}
static void
-LinkSourceVar(GNode *pgn, VarAssign *var)
-{
- Parse_Var_Keep(var, pgn);
-}
-
-static void
LinkVarToTargets(VarAssign *var)
{
GNodeListNode *ln;
for (ln = targets->first; ln != NULL; ln = ln->next)
- LinkSourceVar(ln->datum, var);
+ Parse_Var(var, ln->datum);
}
static bool
@@ -1725,7 +1719,7 @@ VarAssignSpecial(const char *name, const
/* Perform the variable assignment in the given scope. */
static void
-Parse_Var_Keep(VarAssign *var, GNode *scope)
+Parse_Var(VarAssign *var, GNode *scope)
{
FStr avalue; /* actual value (maybe expanded) */
@@ -1736,13 +1730,6 @@ Parse_Var_Keep(VarAssign *var, GNode *sc
}
}
-static void
-Parse_Var(VarAssign *var, GNode *scope)
-{
- Parse_Var_Keep(var, scope);
- free(var->varname);
-}
-
/*
* See if the command possibly calls a sub-make by using the variable
@@ -2718,6 +2705,7 @@ Parse_VarAssign(const char *line, bool f
if (finishDependencyGroup)
FinishDependencyGroup();
Parse_Var(&var, scope);
+ free(var.varname);
return true;
}
Index: src/usr.bin/make/var.c
diff -u src/usr.bin/make/var.c:1.1006 src/usr.bin/make/var.c:1.1007
--- src/usr.bin/make/var.c:1.1006 Thu Jan 27 06:02:59 2022
+++ src/usr.bin/make/var.c Sat Jan 29 01:07:31 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.1006 2022/01/27 06:02:59 sjg Exp $ */
+/* $NetBSD: var.c,v 1.1007 2022/01/29 01:07:31 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.1006 2022/01/27 06:02:59 sjg Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.1007 2022/01/29 01:07:31 rillig Exp $");
/*
* Variables are defined using one of the VAR=value assignments. Their
@@ -1018,29 +1018,6 @@ Var_SetWithFlags(GNode *scope, const cha
VarFreeShortLived(v);
}
-/* See Var_Set for documentation. */
-void
-Var_SetExpandWithFlags(GNode *scope, const char *name, const char *val,
- VarSetFlags flags)
-{
- const char *unexpanded_name = name;
- FStr varname = FStr_InitRefer(name);
-
- assert(val != NULL);
-
- Var_Expand(&varname, scope, VARE_WANTRES);
-
- if (varname.str[0] == '\0') {
- DEBUG2(VAR,
- "Var_SetExpand: variable name \"%s\" expands "
- "to empty string, with value \"%s\" - ignored\n",
- unexpanded_name, val);
- } else
- Var_SetWithFlags(scope, varname.str, val, flags);
-
- FStr_Done(&varname);
-}
-
void
Var_Set(GNode *scope, const char *name, const char *val)
{
@@ -1061,7 +1038,22 @@ Var_Set(GNode *scope, const char *name,
void
Var_SetExpand(GNode *scope, const char *name, const char *val)
{
- Var_SetExpandWithFlags(scope, name, val, VAR_SET_NONE);
+ const char *unexpanded_name = name;
+ FStr varname = FStr_InitRefer(name);
+
+ assert(val != NULL);
+
+ Var_Expand(&varname, scope, VARE_WANTRES);
+
+ if (varname.str[0] == '\0') {
+ DEBUG2(VAR,
+ "Var_SetExpand: variable name \"%s\" expands "
+ "to empty string, with value \"%s\" - ignored\n",
+ unexpanded_name, val);
+ } else
+ Var_SetWithFlags(scope, varname.str, val, VAR_SET_NONE);
+
+ FStr_Done(&varname);
}
void
