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

make(1): reduce memory allocation in ExpandWildcards for suffixes

This commit is contained in:
rillig 2020-11-29 01:19:11 +00:00
parent 26c51dd6fc
commit ddcc472c42
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
/* $NetBSD: suff.c,v 1.319 2020/11/29 01:16:37 rillig Exp $ */ /* $NetBSD: suff.c,v 1.320 2020/11/29 01:19:11 rillig Exp $ */
/* /*
* Copyright (c) 1988, 1989, 1990, 1993 * Copyright (c) 1988, 1989, 1990, 1993
@ -114,7 +114,7 @@
#include "dir.h" #include "dir.h"
/* "@(#)suff.c 8.4 (Berkeley) 3/21/94" */ /* "@(#)suff.c 8.4 (Berkeley) 3/21/94" */
MAKE_RCSID("$NetBSD: suff.c,v 1.319 2020/11/29 01:16:37 rillig Exp $"); MAKE_RCSID("$NetBSD: suff.c,v 1.320 2020/11/29 01:19:11 rillig Exp $");
#define SUFF_DEBUG0(text) DEBUG0(SUFF, text) #define SUFF_DEBUG0(text) DEBUG0(SUFF, text)
#define SUFF_DEBUG1(fmt, arg1) DEBUG1(SUFF, fmt, arg1) #define SUFF_DEBUG1(fmt, arg1) DEBUG1(SUFF, fmt, arg1)
@ -1182,7 +1182,7 @@ static void
ExpandWildcards(GNodeListNode *cln, GNode *pgn) ExpandWildcards(GNodeListNode *cln, GNode *pgn)
{ {
GNode *cgn = cln->datum; GNode *cgn = cln->datum;
StringList *expansions; StringList expansions;
if (!Dir_HasWildcards(cgn->name)) if (!Dir_HasWildcards(cgn->name))
return; return;
@ -1190,15 +1190,15 @@ ExpandWildcards(GNodeListNode *cln, GNode *pgn)
/* /*
* Expand the word along the chosen path * Expand the word along the chosen path
*/ */
expansions = Lst_New(); Lst_Init(&expansions);
Dir_Expand(cgn->name, Suff_FindPath(cgn), expansions); Dir_Expand(cgn->name, Suff_FindPath(cgn), &expansions);
while (!Lst_IsEmpty(expansions)) { while (!Lst_IsEmpty(&expansions)) {
GNode *gn; GNode *gn;
/* /*
* Fetch next expansion off the list and find its GNode * Fetch next expansion off the list and find its GNode
*/ */
char *cp = Lst_Dequeue(expansions); char *cp = Lst_Dequeue(&expansions);
SUFF_DEBUG1("%s...", cp); SUFF_DEBUG1("%s...", cp);
gn = Targ_GetNode(cp); gn = Targ_GetNode(cp);
@ -1209,7 +1209,7 @@ ExpandWildcards(GNodeListNode *cln, GNode *pgn)
pgn->unmade++; pgn->unmade++;
} }
Lst_Free(expansions); Lst_Done(&expansions);
SUFF_DEBUG0("\n"); SUFF_DEBUG0("\n");