d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Constify Var_Dump and simplify it by inlining VarPrintVar.

Browse Source
This commit is contained in:
Hartmut Brandt 2005-03-10 15:38:01 +00:00
parent 248cf569be
commit da559dbfd0
2 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -142,8 +142,6 @@ GNode *VAR_CMD; /* variables defined on the command-line */
#define OPEN_BRACE '{'
#define CLOSE_BRACE '}'
static int VarPrintVar(void *, void *);
/*
* Create a Var object.
*
@ -2098,16 +2096,6 @@ Var_Init(void)
VAR_CMD = Targ_NewGN("Command");
}
/****************** PRINT DEBUGGING INFO *****************/
static int
VarPrintVar(void *vp, void *dummy __unused)
{
Var *v = (Var *) vp;
printf("%-16s = %s\n", v->name, (char *)Buf_GetAll(v->val, (size_t *)NULL));
return (0);
}
/*-
*-----------------------------------------------------------------------
* Var_Dump --
@ -2115,8 +2103,14 @@ VarPrintVar(void *vp, void *dummy __unused)
*-----------------------------------------------------------------------
*/
void
Var_Dump(GNode *ctxt)
Var_Dump(const GNode *ctxt)
{
const LstNode *ln;
const Var *v;
Lst_ForEach(&ctxt->context, VarPrintVar, (void *)NULL);
LST_FOREACH(ln, &ctxt->context) {
v = Lst_Datum(ln);
printf("%-16s = %s\n", v->name,
(const char *)Buf_GetAll(v->val, NULL));
}
}

2
usr.bin/make/var.h
View File

@ -122,6 +122,6 @@ struct Buffer *Var_Subst(const char *, const char *, struct GNode *, Boolean);
char *Var_GetTail(char *);
char *Var_GetHead(char *);
void Var_Init(void);
void Var_Dump(struct GNode *);
void Var_Dump(const struct GNode *);
#endif /* var_h_9cccafce */