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

make(1): migrate Lst_Find to Lst_FindS

Browse Source
This commit is contained in:
rillig 2020-08-28 04:28:45 +00:00
parent acebd2797e
commit 4acfd85d5e
8 changed files with 38 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
usr.bin/make/arch.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: arch.c,v 1.99 2020/08/27 19:15:35 rillig Exp $ */ /* $NetBSD: arch.c,v 1.100 2020/08/28 04:28:45 rillig Exp $ */
/* /*
* Copyright (c) 1988, 1989, 1990, 1993 * Copyright (c) 1988, 1989, 1990, 1993
@ -69,14 +69,14 @@
*/ */
#ifndef MAKE_NATIVE #ifndef MAKE_NATIVE
static char rcsid[] = "$NetBSD: arch.c,v 1.99 2020/08/27 19:15:35 rillig Exp $"; static char rcsid[] = "$NetBSD: arch.c,v 1.100 2020/08/28 04:28:45 rillig Exp $";
#else #else
#include <sys/cdefs.h> #include <sys/cdefs.h>
#ifndef lint #ifndef lint
#if 0 #if 0
static char sccsid[] = "@(#)arch.c 8.2 (Berkeley) 1/2/94"; static char sccsid[] = "@(#)arch.c 8.2 (Berkeley) 1/2/94";
#else #else
__RCSID("$NetBSD: arch.c,v 1.99 2020/08/27 19:15:35 rillig Exp $"); __RCSID("$NetBSD: arch.c,v 1.100 2020/08/28 04:28:45 rillig Exp $");
#endif #endif
#endif /* not lint */ #endif /* not lint */
#endif #endif
@ -548,7 +548,7 @@ ArchStatMember(const char *archive, const char *member, Boolean hash)
member = base + 1; member = base + 1;
} }
ln = Lst_Find(archives, ArchFindArchive, archive); ln = Lst_FindS(archives, ArchFindArchive, archive);
if (ln != NULL) { if (ln != NULL) {
ar = Lst_DatumS(ln); ar = Lst_DatumS(ln);

8
usr.bin/make/cond.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cond.c,v 1.101 2020/08/27 19:15:35 rillig Exp $ */ /* $NetBSD: cond.c,v 1.102 2020/08/28 04:28:45 rillig Exp $ */
/* /*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California. * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@ -70,14 +70,14 @@
*/ */
#ifndef MAKE_NATIVE #ifndef MAKE_NATIVE
static char rcsid[] = "$NetBSD: cond.c,v 1.101 2020/08/27 19:15:35 rillig Exp $"; static char rcsid[] = "$NetBSD: cond.c,v 1.102 2020/08/28 04:28:45 rillig Exp $";
#else #else
#include <sys/cdefs.h> #include <sys/cdefs.h>
#ifndef lint #ifndef lint
#if 0 #if 0
static char sccsid[] = "@(#)cond.c 8.2 (Berkeley) 1/2/94"; static char sccsid[] = "@(#)cond.c 8.2 (Berkeley) 1/2/94";
#else #else
__RCSID("$NetBSD: cond.c,v 1.101 2020/08/27 19:15:35 rillig Exp $"); __RCSID("$NetBSD: cond.c,v 1.102 2020/08/28 04:28:45 rillig Exp $");
#endif #endif
#endif /* not lint */ #endif /* not lint */
#endif #endif
@ -284,7 +284,7 @@ CondFindStrMatch(const void *string, const void *pattern)
static Boolean static Boolean
CondDoMake(int argLen MAKE_ATTR_UNUSED, const char *arg) CondDoMake(int argLen MAKE_ATTR_UNUSED, const char *arg)
{ {
return Lst_Find(create, CondFindStrMatch, arg) != NULL; return Lst_FindS(create, CondFindStrMatch, arg) != NULL;
} }
/* See if the given file exists. */ /* See if the given file exists. */

12
usr.bin/make/dir.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: dir.c,v 1.117 2020/08/28 04:16:57 rillig Exp $ */ /* $NetBSD: dir.c,v 1.118 2020/08/28 04:28:45 rillig Exp $ */
/* /*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California. * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@ -70,14 +70,14 @@
*/ */
#ifndef MAKE_NATIVE #ifndef MAKE_NATIVE
static char rcsid[] = "$NetBSD: dir.c,v 1.117 2020/08/28 04:16:57 rillig Exp $"; static char rcsid[] = "$NetBSD: dir.c,v 1.118 2020/08/28 04:28:45 rillig Exp $";
#else #else
#include <sys/cdefs.h> #include <sys/cdefs.h>
#ifndef lint #ifndef lint
#if 0 #if 0
static char sccsid[] = "@(#)dir.c 8.2 (Berkeley) 1/2/94"; static char sccsid[] = "@(#)dir.c 8.2 (Berkeley) 1/2/94";
#else #else
__RCSID("$NetBSD: dir.c,v 1.117 2020/08/28 04:16:57 rillig Exp $"); __RCSID("$NetBSD: dir.c,v 1.118 2020/08/28 04:28:45 rillig Exp $");
#endif #endif
#endif /* not lint */ #endif /* not lint */
#endif #endif
@ -1544,6 +1544,8 @@ Dir_MTime(GNode *gn, Boolean recheck)
* Input: * Input:
* path the path to which the directory should be * path the path to which the directory should be
* added * added
* XXX: Why would this ever be NULL, and what does
* that mean?
* name the name of the directory to add * name the name of the directory to add
* *
* Results: * Results:
@ -1563,7 +1565,7 @@ Dir_AddDir(Lst path, const char *name)
struct dirent *dp; /* entry in directory */ struct dirent *dp; /* entry in directory */
if (strcmp(name, ".DOTLAST") == 0) { if (strcmp(name, ".DOTLAST") == 0) {
ln = Lst_Find(path, DirFindName, name); ln = path != NULL ? Lst_FindS(path, DirFindName, name) : NULL;
if (ln != NULL) if (ln != NULL)
return Lst_DatumS(ln); return Lst_DatumS(ln);
else { else {
@ -1576,7 +1578,7 @@ Dir_AddDir(Lst path, const char *name)
} }
if (path) if (path)
ln = Lst_Find(openDirectories, DirFindName, name); ln = Lst_FindS(openDirectories, DirFindName, name);
if (ln != NULL) { if (ln != NULL) {
p = Lst_DatumS(ln); p = Lst_DatumS(ln);
if (path && Lst_MemberS(path, p) == NULL) { if (path && Lst_MemberS(path, p) == NULL) {

39
usr.bin/make/lst.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: lst.c,v 1.48 2020/08/28 04:14:31 rillig Exp $ */ /* $NetBSD: lst.c,v 1.49 2020/08/28 04:28:45 rillig Exp $ */
/* /*
* Copyright (c) 1988, 1989, 1990, 1993 * Copyright (c) 1988, 1989, 1990, 1993
@ -37,11 +37,11 @@
#include "make.h" #include "make.h"
#ifndef MAKE_NATIVE #ifndef MAKE_NATIVE
static char rcsid[] = "$NetBSD: lst.c,v 1.48 2020/08/28 04:14:31 rillig Exp $"; static char rcsid[] = "$NetBSD: lst.c,v 1.49 2020/08/28 04:28:45 rillig Exp $";
#else #else
#include <sys/cdefs.h> #include <sys/cdefs.h>
#ifndef lint #ifndef lint
__RCSID("$NetBSD: lst.c,v 1.48 2020/08/28 04:14:31 rillig Exp $"); __RCSID("$NetBSD: lst.c,v 1.49 2020/08/28 04:28:45 rillig Exp $");
#endif /* not lint */ #endif /* not lint */
#endif #endif
@ -330,18 +330,6 @@ LstNode_SetNullS(LstNode node)
* Node-specific functions * Node-specific functions
*/ */
/* Return the first node from the given list, or NULL if the list is empty or
* invalid. */
static LstNode
Lst_First(Lst list)
{
if (!LstIsValid(list) || LstIsEmpty(list)) {
return NULL;
} else {
return list->first;
}
}
/* Return the first node from the given list, or NULL if the list is empty. */ /* Return the first node from the given list, or NULL if the list is empty. */
LstNode LstNode
Lst_FirstS(Lst list) Lst_FirstS(Lst list)
@ -399,14 +387,6 @@ Lst_IsEmptyS(Lst list)
return LstIsEmpty(list); return LstIsEmpty(list);
} }
/* Return the first node from the given list for which the given comparison
* function returns 0, or NULL if none of the nodes matches. */
LstNode
Lst_Find(Lst list, LstFindProc cmp, const void *cmpData)
{
return Lst_FindFrom(list, Lst_First(list), cmp, cmpData);
}
/* Return the first node from the given list for which the given comparison /* Return the first node from the given list for which the given comparison
* function returns 0, or NULL if none of the nodes matches. */ * function returns 0, or NULL if none of the nodes matches. */
LstNode LstNode
@ -417,19 +397,6 @@ Lst_FindS(Lst list, LstFindProc cmp, const void *cmpData)
return Lst_FindFromS(list, Lst_FirstS(list), cmp, cmpData); return Lst_FindFromS(list, Lst_FirstS(list), cmp, cmpData);
} }
/* Return the first node from the given list, starting at the given node, for
* which the given comparison function returns 0, or NULL if none of the nodes
* matches. */
LstNode
Lst_FindFrom(Lst list, LstNode node, LstFindProc cmp, const void *cmpData)
{
if (!LstIsValid(list) || LstIsEmpty(list) || !LstNodeIsValid(node)) {
return NULL;
}
return Lst_FindFromS(list, node, cmp, cmpData);
}
/* Return the first node from the given list, starting at the given node, for /* Return the first node from the given list, starting at the given node, for
* which the given comparison function returns 0, or NULL if none of the nodes * which the given comparison function returns 0, or NULL if none of the nodes
* matches. */ * matches. */

4
usr.bin/make/lst.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: lst.h,v 1.51 2020/08/28 04:16:57 rillig Exp $ */ /* $NetBSD: lst.h,v 1.52 2020/08/28 04:28:45 rillig Exp $ */
/* /*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California. * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@ -145,10 +145,8 @@ void *Lst_DatumS(LstNode);
* Functions for entire lists * Functions for entire lists
*/ */
/* Find an element in a list */ /* Find an element in a list */
LstNode Lst_Find(Lst, LstFindProc, const void *);
LstNode Lst_FindS(Lst, LstFindProc, const void *); LstNode Lst_FindS(Lst, LstFindProc, const void *);
/* Find an element starting from somewhere */ /* Find an element starting from somewhere */
LstNode Lst_FindFrom(Lst, LstNode, LstFindProc, const void *);
LstNode Lst_FindFromS(Lst, LstNode, LstFindProc, const void *); LstNode Lst_FindFromS(Lst, LstNode, LstFindProc, const void *);
/* /*
* See if the given datum is on the list. Returns the LstNode containing * See if the given datum is on the list. Returns the LstNode containing

12
usr.bin/make/main.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: main.c,v 1.318 2020/08/28 04:14:31 rillig Exp $ */ /* $NetBSD: main.c,v 1.319 2020/08/28 04:28:45 rillig Exp $ */
/* /*
* Copyright (c) 1988, 1989, 1990, 1993 * Copyright (c) 1988, 1989, 1990, 1993
@ -69,7 +69,7 @@
*/ */
#ifndef MAKE_NATIVE #ifndef MAKE_NATIVE
static char rcsid[] = "$NetBSD: main.c,v 1.318 2020/08/28 04:14:31 rillig Exp $"; static char rcsid[] = "$NetBSD: main.c,v 1.319 2020/08/28 04:28:45 rillig Exp $";
#else #else
#include <sys/cdefs.h> #include <sys/cdefs.h>
#ifndef lint #ifndef lint
@ -81,7 +81,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993\
#if 0 #if 0
static char sccsid[] = "@(#)main.c 8.3 (Berkeley) 3/19/94"; static char sccsid[] = "@(#)main.c 8.3 (Berkeley) 3/19/94";
#else #else
__RCSID("$NetBSD: main.c,v 1.318 2020/08/28 04:14:31 rillig Exp $"); __RCSID("$NetBSD: main.c,v 1.319 2020/08/28 04:28:45 rillig Exp $");
#endif #endif
#endif /* not lint */ #endif /* not lint */
#endif #endif
@ -1330,7 +1330,7 @@ main(int argc, char **argv)
if (Lst_IsEmptyS(sysMkPath)) if (Lst_IsEmptyS(sysMkPath))
Fatal("%s: no system rules (%s).", progname, Fatal("%s: no system rules (%s).", progname,
_PATH_DEFSYSMK); _PATH_DEFSYSMK);
ln = Lst_Find(sysMkPath, ReadMakefile, NULL); ln = Lst_FindS(sysMkPath, ReadMakefile, NULL);
if (ln == NULL) if (ln == NULL)
Fatal("%s: cannot open %s.", progname, Fatal("%s: cannot open %s.", progname,
(char *)Lst_DatumS(ln)); (char *)Lst_DatumS(ln));
@ -1339,7 +1339,7 @@ main(int argc, char **argv)
if (!Lst_IsEmptyS(makefiles)) { if (!Lst_IsEmptyS(makefiles)) {
LstNode ln; LstNode ln;
ln = Lst_Find(makefiles, ReadAllMakefiles, NULL); ln = Lst_FindS(makefiles, ReadAllMakefiles, NULL);
if (ln != NULL) if (ln != NULL)
Fatal("%s: cannot open %s.", progname, Fatal("%s: cannot open %s.", progname,
(char *)Lst_DatumS(ln)); (char *)Lst_DatumS(ln));
@ -1348,7 +1348,7 @@ main(int argc, char **argv)
VAR_CMD, VARE_WANTRES); VAR_CMD, VARE_WANTRES);
if (p1) { if (p1) {
(void)str2Lst_Append(makefiles, p1, NULL); (void)str2Lst_Append(makefiles, p1, NULL);
(void)Lst_Find(makefiles, ReadMakefile, NULL); (void)Lst_FindS(makefiles, ReadMakefile, NULL);
free(p1); free(p1);
} }
} }

10
usr.bin/make/meta.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: meta.c,v 1.104 2020/08/28 04:14:31 rillig Exp $ */ /* $NetBSD: meta.c,v 1.105 2020/08/28 04:28:45 rillig Exp $ */
/* /*
* Implement 'meta' mode. * Implement 'meta' mode.
@ -1334,13 +1334,13 @@ meta_oodate(GNode *gn, Boolean oodate)
case 'D': /* unlink */ case 'D': /* unlink */
if (*p == '/' && !Lst_IsEmptyS(missingFiles)) { if (*p == '/' && !Lst_IsEmptyS(missingFiles)) {
/* remove any missingFiles entries that match p */ /* remove any missingFiles entries that match p */
ln = Lst_Find(missingFiles, path_match, p); ln = Lst_FindS(missingFiles, path_match, p);
if (ln != NULL) { if (ln != NULL) {
LstNode nln; LstNode nln;
char *tp; char *tp;
do { do {
nln = Lst_FindFrom(missingFiles, Lst_SuccS(ln), nln = Lst_FindFromS(missingFiles, Lst_SuccS(ln),
path_match, p); path_match, p);
tp = Lst_DatumS(ln); tp = Lst_DatumS(ln);
Lst_RemoveS(missingFiles, ln); Lst_RemoveS(missingFiles, ln);
@ -1411,7 +1411,7 @@ meta_oodate(GNode *gn, Boolean oodate)
if ((link_src != NULL && cached_lstat(p, &fs) < 0) || if ((link_src != NULL && cached_lstat(p, &fs) < 0) ||
(link_src == NULL && cached_stat(p, &fs) < 0)) { (link_src == NULL && cached_stat(p, &fs) < 0)) {
if (!meta_ignore(gn, p)) { if (!meta_ignore(gn, p)) {
if (Lst_Find(missingFiles, string_match, p) == NULL) if (Lst_FindS(missingFiles, string_match, p) == NULL)
Lst_AppendS(missingFiles, bmake_strdup(p)); Lst_AppendS(missingFiles, bmake_strdup(p));
} }
} }
@ -1497,7 +1497,7 @@ meta_oodate(GNode *gn, Boolean oodate)
* A referenced file outside of CWD is missing. * A referenced file outside of CWD is missing.
* We cannot catch every eventuality here... * We cannot catch every eventuality here...
*/ */
if (Lst_Find(missingFiles, string_match, p) == NULL) if (Lst_FindS(missingFiles, string_match, p) == NULL)
Lst_AppendS(missingFiles, bmake_strdup(p)); Lst_AppendS(missingFiles, bmake_strdup(p));
} }
} }

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

@ -1,4 +1,4 @@
/* $NetBSD: suff.c,v 1.123 2020/08/28 04:14:31 rillig Exp $ */ /* $NetBSD: suff.c,v 1.124 2020/08/28 04:28:45 rillig Exp $ */
/* /*
* Copyright (c) 1988, 1989, 1990, 1993 * Copyright (c) 1988, 1989, 1990, 1993
@ -69,14 +69,14 @@
*/ */
#ifndef MAKE_NATIVE #ifndef MAKE_NATIVE
static char rcsid[] = "$NetBSD: suff.c,v 1.123 2020/08/28 04:14:31 rillig Exp $"; static char rcsid[] = "$NetBSD: suff.c,v 1.124 2020/08/28 04:28:45 rillig Exp $";
#else #else
#include <sys/cdefs.h> #include <sys/cdefs.h>
#ifndef lint #ifndef lint
#if 0 #if 0
static char sccsid[] = "@(#)suff.c 8.4 (Berkeley) 3/21/94"; static char sccsid[] = "@(#)suff.c 8.4 (Berkeley) 3/21/94";
#else #else
__RCSID("$NetBSD: suff.c,v 1.123 2020/08/28 04:14:31 rillig Exp $"); __RCSID("$NetBSD: suff.c,v 1.124 2020/08/28 04:28:45 rillig Exp $");
#endif #endif
#endif /* not lint */ #endif /* not lint */
#endif #endif
@ -624,7 +624,7 @@ SuffParseTransform(char *str, Suff **srcPtr, Suff **targPtr)
if (srcLn == NULL) { if (srcLn == NULL) {
srcLn = Lst_FindS(sufflist, SuffSuffIsPrefix, str); srcLn = Lst_FindS(sufflist, SuffSuffIsPrefix, str);
} else { } else {
srcLn = Lst_FindFrom(sufflist, Lst_SuccS(srcLn), srcLn = Lst_FindFromS(sufflist, Lst_SuccS(srcLn),
SuffSuffIsPrefix, str); SuffSuffIsPrefix, str);
} }
if (srcLn == NULL) { if (srcLn == NULL) {
@ -713,7 +713,7 @@ Suff_AddTransform(char *line)
*t; /* target suffix */ *t; /* target suffix */
LstNode ln; /* Node for existing transformation */ LstNode ln; /* Node for existing transformation */
ln = Lst_Find(transforms, SuffGNHasNameP, line); ln = Lst_FindS(transforms, SuffGNHasNameP, line);
if (ln == NULL) { if (ln == NULL) {
/* /*
* Make a new graph node for the transformation. It will be filled in * Make a new graph node for the transformation. It will be filled in
@ -1818,7 +1818,7 @@ SuffApplyTransform(GNode *tGn, GNode *sGn, Suff *t, Suff *s)
* Locate the transformation rule itself * Locate the transformation rule itself
*/ */
tname = str_concat2(s->name, t->name); tname = str_concat2(s->name, t->name);
ln = Lst_Find(transforms, SuffGNHasNameP, tname); ln = Lst_FindS(transforms, SuffGNHasNameP, tname);
free(tname); free(tname);
if (ln == NULL) { if (ln == NULL) {
@ -1983,7 +1983,7 @@ SuffFindArchiveDeps(GNode *gn, Lst slst)
*/ */
sd.len = eoarch - gn->name; sd.len = eoarch - gn->name;
sd.ename = eoarch; sd.ename = eoarch;
ln = Lst_Find(ms->parents, SuffSuffIsSuffixP, &sd); ln = Lst_FindS(ms->parents, SuffSuffIsSuffixP, &sd);
if (ln != NULL) { if (ln != NULL) {
/* /*
@ -2093,7 +2093,7 @@ SuffFindNormalDeps(GNode *gn, Lst slst)
/* /*
* Look for next possible suffix... * Look for next possible suffix...
*/ */
ln = Lst_FindFrom(sufflist, ln, SuffSuffIsSuffixP, &sd); ln = Lst_FindFromS(sufflist, ln, SuffSuffIsSuffixP, &sd);
if (ln != NULL) { if (ln != NULL) {
int prefLen; /* Length of the prefix */ int prefLen; /* Length of the prefix */