Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make: inline functions that have a single call site 

No functional change.
This commit is contained in:
rillig 2022-01-29 01:07:31 +00:00
parent 33b1fb5e4c
commit 5643b394fa
3 changed files with 25 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
usr.bin/make/make.h
View File

@ -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;

24
usr.bin/make/parse.c
View File

@ -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.
@ -1281,19 +1281,13 @@ ParseDependencySourcesSpecial(char *start,
}
}
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 char *avalue)
/* 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 *scope)
}
}
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 finishDependencyGroup, GNode *scope)
if (finishDependencyGroup)
FinishDependencyGroup();
Parse_Var(&var, scope);
free(var.varname);
return true;
}

44
usr.bin/make/var.c
View File

@ -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 char *name, const char *val,
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, const char *val)
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