summaryrefslogtreecommitdiff
path: root/usr.bin/make/parse.c
diff options
context:
space:
mode:
authorrillig <rillig@NetBSD.org>2022-06-11 17:41:35 +0000
committerrillig <rillig@NetBSD.org>2022-06-11 17:41:35 +0000
commitb3f0b1c708c727243c90f04fb4f6bd55dbeefdb4 (patch)
tree729010f0cfa0aae3c11ff0b4ee103b126d57196e /usr.bin/make/parse.c
parentea348b1bc9fc0b49482c182415522d719a2a3532 (diff)
make: separate cases in HandleDependencyTargetMundane
Most targets do not use wildcards, so there is no need to put the single item into a list. No functional change.
Diffstat (limited to 'usr.bin/make/parse.c')
-rw-r--r--usr.bin/make/parse.c23
1 files changed, 12 insertions, 11 deletions
diff --git a/usr.bin/make/parse.c b/usr.bin/make/parse.c
index e8212831568..c00be485ab7 100644
--- a/usr.bin/make/parse.c
+++ b/usr.bin/make/parse.c
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.677 2022/06/11 16:47:24 rillig Exp $ */
+/* $NetBSD: parse.c,v 1.678 2022/06/11 17:41:35 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -105,7 +105,7 @@
#include "pathnames.h"
/* "@(#)parse.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: parse.c,v 1.677 2022/06/11 16:47:24 rillig Exp $");
+MAKE_RCSID("$NetBSD: parse.c,v 1.678 2022/06/11 17:41:35 rillig Exp $");
/*
* A file being read.
@@ -1033,21 +1033,22 @@ HandleSingleDependencyTargetMundane(const char *name)
}
static void
-HandleDependencyTargetMundane(char *targetName)
+HandleDependencyTargetMundane(const char *targetName)
{
- StringList targetNames = LST_INIT;
-
if (Dir_HasWildcards(targetName)) {
+ StringList targetNames = LST_INIT;
+
SearchPath *emptyPath = SearchPath_New();
SearchPath_Expand(emptyPath, targetName, &targetNames);
SearchPath_Free(emptyPath);
- } else
- Lst_Append(&targetNames, targetName);
- while (!Lst_IsEmpty(&targetNames)) {
- char *targName = Lst_Dequeue(&targetNames);
- HandleSingleDependencyTargetMundane(targName);
- }
+ while (!Lst_IsEmpty(&targetNames)) {
+ char *targName = Lst_Dequeue(&targetNames);
+ HandleSingleDependencyTargetMundane(targName);
+ /* TODO: free targName */
+ }
+ } else
+ HandleSingleDependencyTargetMundane(targetName);
}
static void