summaryrefslogtreecommitdiffstats
path: root/usr.bin/make/suff.c
diff options
context:
space:
mode:
authorharti <harti@FreeBSD.org>2004-12-07 10:14:16 +0000
committerharti <harti@FreeBSD.org>2004-12-07 10:14:16 +0000
commite65ea2146d73aa6aedf8ef3fb0fd535039da6887 (patch)
treedc544ee893c2b95a0e4d64009cb9fe98b5598e7c /usr.bin/make/suff.c
parent4a639d6164f667049cce0046d22e760ca1aad3f2 (diff)
downloadFreeBSD-src-e65ea2146d73aa6aedf8ef3fb0fd535039da6887.zip
FreeBSD-src-e65ea2146d73aa6aedf8ef3fb0fd535039da6887.tar.gz
Make needs no circular lists so remove them from the list code.
Diffstat (limited to 'usr.bin/make/suff.c')
-rw-r--r--usr.bin/make/suff.c54
1 files changed, 27 insertions, 27 deletions
diff --git a/usr.bin/make/suff.c b/usr.bin/make/suff.c
index 4d7165d..9a820aa 100644
--- a/usr.bin/make/suff.c
+++ b/usr.bin/make/suff.c
@@ -444,7 +444,7 @@ Suff_ClearSuffixes(void)
{
Lst_Concat(suffClean, sufflist, LST_CONCLINK);
- sufflist = Lst_Init(FALSE);
+ sufflist = Lst_Init();
sNum = 1;
suffNull = emptySuff;
/*
@@ -454,7 +454,7 @@ Suff_ClearSuffixes(void)
* suffNull should not have parents.
*/
Lst_Destroy(suffNull->children, NOFREE);
- suffNull->children = Lst_Init(FALSE);
+ suffNull->children = Lst_Init();
}
/*-
@@ -596,8 +596,8 @@ Suff_AddTransform(char *line)
gn = Lst_Datum(ln);
Lst_Destroy(gn->commands, NOFREE);
Lst_Destroy(gn->children, NOFREE);
- gn->commands = Lst_Init(FALSE);
- gn->children = Lst_Init(FALSE);
+ gn->commands = Lst_Init();
+ gn->children = Lst_Init();
}
gn->type = OP_TRANSFORM;
@@ -776,10 +776,10 @@ Suff_AddSuffix(char *str)
s->name = estrdup(str);
s->nameLen = strlen (s->name);
- s->searchPath = Lst_Init(FALSE);
- s->children = Lst_Init(FALSE);
- s->parents = Lst_Init(FALSE);
- s->ref = Lst_Init(FALSE);
+ s->searchPath = Lst_Init();
+ s->children = Lst_Init();
+ s->parents = Lst_Init();
+ s->ref = Lst_Init();
s->sNum = sNum++;
s->flags = 0;
s->refCount = 0;
@@ -853,8 +853,8 @@ Suff_DoPaths(void)
return;
}
- inIncludes = Lst_Init(FALSE);
- inLibs = Lst_Init(FALSE);
+ inIncludes = Lst_Init();
+ inLibs = Lst_Init();
while ((ln = Lst_Next(sufflist)) != NULL) {
s = Lst_Datum(ln);
@@ -987,7 +987,7 @@ SuffAddSrc(void *sp, void *lsp)
targ->children += 1;
Lst_AtEnd(ls->l, s2);
#ifdef DEBUG_SRC
- s2->cp = Lst_Init(FALSE);
+ s2->cp = Lst_Init();
Lst_AtEnd(targ->cp, s2);
printf("1 add %x %x to %x:", targ, s2, ls->l);
Lst_ForEach(ls->l, PrintAddr, (void *)NULL);
@@ -1005,7 +1005,7 @@ SuffAddSrc(void *sp, void *lsp)
targ->children += 1;
Lst_AtEnd(ls->l, s2);
#ifdef DEBUG_SRC
- s2->cp = Lst_Init(FALSE);
+ s2->cp = Lst_Init();
Lst_AtEnd(targ->cp, s2);
printf("2 add %x %x to %x:", targ, s2, ls->l);
Lst_ForEach(ls->l, PrintAddr, (void *)NULL);
@@ -1235,7 +1235,7 @@ SuffFindCmds (Src *targ, Lst slst)
ret->children = 0;
targ->children += 1;
#ifdef DEBUG_SRC
- ret->cp = Lst_Init(FALSE);
+ ret->cp = Lst_Init();
printf("3 add %x %x\n", targ, ret);
Lst_AtEnd(targ->cp, ret);
#endif
@@ -1293,7 +1293,7 @@ SuffExpandChildren(void *cgnp, void *pgnp)
cp = Var_Subst(NULL, cgn->name, pgn, TRUE);
if (cp != NULL) {
- Lst members = Lst_Init(FALSE);
+ Lst members = Lst_Init();
if (cgn->type & OP_ARCHV) {
/*
@@ -1432,7 +1432,7 @@ SuffExpandChildren(void *cgnp, void *pgnp)
/*
* Expand the word along the chosen path
*/
- exp = Lst_Init(FALSE);
+ exp = Lst_Init();
Dir_Expand(cgn->name, path, exp);
while (!Lst_IsEmpty(exp)) {
@@ -1746,8 +1746,8 @@ SuffFindNormalDeps(GNode *gn, Lst slst)
* Begin at the beginning...
*/
ln = Lst_First(sufflist);
- srcs = Lst_Init(FALSE);
- targs = Lst_Init(FALSE);
+ srcs = Lst_Init();
+ targs = Lst_Init();
/*
* We're caught in a catch-22 here. On the one hand, we want to use any
@@ -1789,7 +1789,7 @@ SuffFindNormalDeps(GNode *gn, Lst slst)
target->parent = NULL;
target->children = 0;
#ifdef DEBUG_SRC
- target->cp = Lst_Init(FALSE);
+ target->cp = Lst_Init();
#endif
/*
@@ -1833,7 +1833,7 @@ SuffFindNormalDeps(GNode *gn, Lst slst)
targ->children = 0;
targ->pref = estrdup(sopref);
#ifdef DEBUG_SRC
- targ->cp = Lst_Init(FALSE);
+ targ->cp = Lst_Init();
#endif
/*
@@ -2227,10 +2227,10 @@ void
Suff_Init(void)
{
- sufflist = Lst_Init(FALSE);
- suffClean = Lst_Init(FALSE);
- srclist = Lst_Init(FALSE);
- transforms = Lst_Init(FALSE);
+ sufflist = Lst_Init();
+ suffClean = Lst_Init();
+ srclist = Lst_Init();
+ transforms = Lst_Init();
sNum = 0;
/*
@@ -2242,11 +2242,11 @@ Suff_Init(void)
suffNull->name = estrdup("");
suffNull->nameLen = 0;
- suffNull->searchPath = Lst_Init(FALSE);
+ suffNull->searchPath = Lst_Init();
Dir_Concat(suffNull->searchPath, dirSearchPath);
- suffNull->children = Lst_Init(FALSE);
- suffNull->parents = Lst_Init(FALSE);
- suffNull->ref = Lst_Init(FALSE);
+ suffNull->children = Lst_Init();
+ suffNull->parents = Lst_Init();
+ suffNull->ref = Lst_Init();
suffNull->sNum = sNum++;
suffNull->flags = SUFF_NULL;
suffNull->refCount = 1;
OpenPOWER on IntegriCloud