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

Get rid of another Lst_ForEach in favour of LST_FOREACH. Get rid

Browse Source 
of the now unused struct LstSrc and collapes two functions into one.
This commit is contained in:
harti 2005-03-14 17:04:58 +00:00
parent e46b6260f7
commit 6427cb7c26
1 changed files with 42 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
usr.bin/make/suff.c
View File

@ -157,15 +157,6 @@ typedef struct Src {
#endif #endif
} Src; } Src;
/*
* A structure for passing more than one argument to the Lst-library-invoked
* function...
*/
typedef struct {
Lst *l;
Src *s;
} LstSrc;
/* The NULL suffix for this run */ /* The NULL suffix for this run */
static Suff *suffNull; static Suff *suffNull;
@ -977,72 +968,13 @@ SuffSrcCreate(char *file, char *prefix, Suff *suff, Src *parent, GNode *node)
/*- /*-
*----------------------------------------------------------------------- *-----------------------------------------------------------------------
* SuffAddSrc -- * SuffAddLevel --
* Add all the children of targ as Src structures to the given list:
* Add a suffix as a Src structure to the given list with its parent * Add a suffix as a Src structure to the given list with its parent
* being the given Src structure. If the suffix is the null suffix, * being the given Src structure. If the suffix is the null suffix,
* the prefix is used unaltered as the file name in the Src structure. * the prefix is used unaltered as the file name in the Src structure.
* *
* Results: * Results:
* always returns 0
*
* Side Effects:
* A Src structure is created and tacked onto the end of the list
*-----------------------------------------------------------------------
*/
static int
SuffAddSrc(void *sp, void *lsp)
{
Suff *s = sp;
LstSrc *ls = lsp;
Src *s2; /* new Src structure */
Src *targ; /* Target structure */
#ifdef DEBUG_SRC
const LstNode *ln;
#endif
targ = ls->s;
if ((s->flags & SUFF_NULL) && (*s->name != '\0')) {
/*
* If the suffix has been marked as the NULL suffix, also
* create a Src structure for a file with no suffix attached.
* Two birds, and all that...
*/
s2 = SuffSrcCreate(estrdup(targ->pref), targ->pref,
s, targ, NULL);
s->refCount++;
targ->children += 1;
Lst_AtEnd(ls->l, s2);
#ifdef DEBUG_SRC
Lst_AtEnd(&targ->cp, s2);
printf("1 add %p %p to %p:", targ, s2, ls->l);
LST_FOREACH(ln, ls->l)
printf("%p ", (const void *)Lst_Datum(ln));
printf("\n");
#endif
}
s2 = SuffSrcCreate(str_concat(targ->pref, s->name, 0), targ->pref,
s, targ, NULL);
s->refCount++;
targ->children += 1;
Lst_AtEnd(ls->l, s2);
#ifdef DEBUG_SRC
Lst_AtEnd(&targ->cp, s2);
printf("2 add %p %p to %p:", targ, s2, ls->l);
LST_FOREACH(ln, ls->l)
printf("%p ", (const void *)Lst_Datum(ln));
printf("\n");
#endif
return (0);
}
/*-
*-----------------------------------------------------------------------
* SuffAddLevel --
* Add all the children of targ as Src structures to the given list
*
* Results:
* None * None
* *
* Side Effects: * Side Effects:
@ -1052,12 +984,48 @@ SuffAddSrc(void *sp, void *lsp)
static void static void
SuffAddLevel(Lst *l, Src *targ) SuffAddLevel(Lst *l, Src *targ)
{ {
LstSrc ls; LstNode *ln;
Suff *suff;
Src *s2;
#ifdef DEBUG_SRC
const LstNode *ln1;
#endif
ls.s = targ; LST_FOREACH(ln, &targ->suff->children) {
ls.l = l; suff = Lst_Datum(ln);
Lst_ForEach(&targ->suff->children, SuffAddSrc, &ls); if ((suff->flags & SUFF_NULL) && *suff->name != '\0') {
/*
* If the suffix has been marked as the NULL suffix,
* also create a Src structure for a file with no suffix
* attached. Two birds, and all that...
*/
s2 = SuffSrcCreate(estrdup(targ->pref), targ->pref,
suff, targ, NULL);
suff->refCount++;
targ->children += 1;
Lst_AtEnd(l, s2);
#ifdef DEBUG_SRC
Lst_AtEnd(&targ->cp, s2);
printf("1 add %p %p to %p:", targ, s2, l);
LST_FOREACH(ln1, l)
printf("%p ", (const void *)Lst_Datum(ln1));
printf("\n");
#endif
}
s2 = SuffSrcCreate(str_concat(targ->pref, suff->name, 0),
targ->pref, suff, targ, NULL);
suff->refCount++;
targ->children += 1;
Lst_AtEnd(l, s2);
#ifdef DEBUG_SRC
Lst_AtEnd(&targ->cp, s2);
printf("2 add %p %p to %p:", targ, s2, l);
LST_FOREACH(ln1, l)
printf("%p ", (const void *)Lst_Datum(ln1));
printf("\n");
#endif
}
} }
/*- /*-