Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/usr.bin/make make(1): remove void pointers from ParseAddDir
details: https://anonhg.NetBSD.org/src/rev/646a62e6b328
branches: trunk
changeset: 945065:646a62e6b328
user: rillig <rillig%NetBSD.org@localhost>
date: Mon Oct 19 20:55:30 2020 +0000
description:
make(1): remove void pointers from ParseAddDir
diffstat:
usr.bin/make/parse.c | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diffs (58 lines):
diff -r ad40e54d531a -r 646a62e6b328 usr.bin/make/parse.c
--- a/usr.bin/make/parse.c Mon Oct 19 20:51:18 2020 +0000
+++ b/usr.bin/make/parse.c Mon Oct 19 20:55:30 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.392 2020/10/19 20:51:18 rillig Exp $ */
+/* $NetBSD: parse.c,v 1.393 2020/10/19 20:55:30 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -131,7 +131,7 @@
#include "pathnames.h"
/* "@(#)parse.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: parse.c,v 1.392 2020/10/19 20:51:18 rillig Exp $");
+MAKE_RCSID("$NetBSD: parse.c,v 1.393 2020/10/19 20:55:30 rillig Exp $");
/* types and constants */
@@ -1013,12 +1013,6 @@
}
}
-static void
-ParseAddDir(void *path, void *name)
-{
- (void)Dir_AddDir(path, name);
-}
-
/*
* We got to the end of the line while we were still looking at targets.
*
@@ -1386,6 +1380,16 @@
}
}
+static void
+AddToPaths(const char *dir, SearchPathList *paths)
+{
+ if (paths != NULL) {
+ SearchPathListNode *ln;
+ for (ln = paths->first; ln != NULL; ln = ln->next)
+ (void)Dir_AddDir(ln->datum, dir);
+ }
+}
+
/*
* If the target was one that doesn't take files as its sources
* but takes something like suffixes, we take each
@@ -1422,8 +1426,7 @@
Suff_AddSuffix(line, &mainNode);
break;
case ExPath:
- if (paths != NULL)
- Lst_ForEach(paths, ParseAddDir, line);
+ AddToPaths(line, paths);
break;
case Includes:
Suff_AddInclude(line);
Home |
Main Index |
Thread Index |
Old Index