Module Name: src
Committed By: rillig
Date: Sat Aug 29 10:12:06 UTC 2020
Modified Files:
src/usr.bin/make: arch.c cond.c dir.c lst.c lst.h main.c meta.c suff.c
Log Message:
make(1): rename Lst_FindB back to Lst_Find
The migration from "comparison function" to "match function" is done,
the "B" in the names is no longer needed.
To generate a diff of this commit:
cvs rdiff -u -r1.103 -r1.104 src/usr.bin/make/arch.c
cvs rdiff -u -r1.104 -r1.105 src/usr.bin/make/cond.c
cvs rdiff -u -r1.121 -r1.122 src/usr.bin/make/dir.c
cvs rdiff -u -r1.54 -r1.55 src/usr.bin/make/lst.c
cvs rdiff -u -r1.55 -r1.56 src/usr.bin/make/lst.h
cvs rdiff -u -r1.325 -r1.326 src/usr.bin/make/main.c
cvs rdiff -u -r1.108 -r1.109 src/usr.bin/make/meta.c
cvs rdiff -u -r1.129 -r1.130 src/usr.bin/make/suff.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/arch.c
diff -u src/usr.bin/make/arch.c:1.103 src/usr.bin/make/arch.c:1.104
--- src/usr.bin/make/arch.c:1.103 Sat Aug 29 09:30:10 2020
+++ src/usr.bin/make/arch.c Sat Aug 29 10:12:06 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: arch.c,v 1.103 2020/08/29 09:30:10 rillig Exp $ */
+/* $NetBSD: arch.c,v 1.104 2020/08/29 10:12:06 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: arch.c,v 1.103 2020/08/29 09:30:10 rillig Exp $";
+static char rcsid[] = "$NetBSD: arch.c,v 1.104 2020/08/29 10:12:06 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)arch.c 8.2 (Berkeley) 1/2/94";
#else
-__RCSID("$NetBSD: arch.c,v 1.103 2020/08/29 09:30:10 rillig Exp $");
+__RCSID("$NetBSD: arch.c,v 1.104 2020/08/29 10:12:06 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -455,7 +455,7 @@ Arch_ParseArchive(char **linePtr, Lst no
}
/* See if the given archive is the one we are looking for.
- * Called via Lst_FindB. */
+ * Called via Lst_Find. */
static Boolean
ArchFindArchive(const void *ar, const void *desiredName)
{
@@ -507,7 +507,7 @@ ArchStatMember(const char *archive, cons
member = base + 1;
}
- ln = Lst_FindB(archives, ArchFindArchive, archive);
+ ln = Lst_Find(archives, ArchFindArchive, archive);
if (ln != NULL) {
ar = Lst_Datum(ln);
Index: src/usr.bin/make/cond.c
diff -u src/usr.bin/make/cond.c:1.104 src/usr.bin/make/cond.c:1.105
--- src/usr.bin/make/cond.c:1.104 Sat Aug 29 09:30:10 2020
+++ src/usr.bin/make/cond.c Sat Aug 29 10:12:06 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cond.c,v 1.104 2020/08/29 09:30:10 rillig Exp $ */
+/* $NetBSD: cond.c,v 1.105 2020/08/29 10:12:06 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -70,14 +70,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: cond.c,v 1.104 2020/08/29 09:30:10 rillig Exp $";
+static char rcsid[] = "$NetBSD: cond.c,v 1.105 2020/08/29 10:12:06 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)cond.c 8.2 (Berkeley) 1/2/94";
#else
-__RCSID("$NetBSD: cond.c,v 1.104 2020/08/29 09:30:10 rillig Exp $");
+__RCSID("$NetBSD: cond.c,v 1.105 2020/08/29 10:12:06 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -272,7 +272,7 @@ CondDoDefined(int argLen MAKE_ATTR_UNUSE
return result;
}
-/* Wrapper around Str_Match, to be used by Lst_FindB. */
+/* Wrapper around Str_Match, to be used by Lst_Find. */
static Boolean
CondFindStrMatch(const void *string, const void *pattern)
{
@@ -283,7 +283,7 @@ CondFindStrMatch(const void *string, con
static Boolean
CondDoMake(int argLen MAKE_ATTR_UNUSED, const char *arg)
{
- return Lst_FindB(create, CondFindStrMatch, arg) != NULL;
+ return Lst_Find(create, CondFindStrMatch, arg) != NULL;
}
/* See if the given file exists. */
Index: src/usr.bin/make/dir.c
diff -u src/usr.bin/make/dir.c:1.121 src/usr.bin/make/dir.c:1.122
--- src/usr.bin/make/dir.c:1.121 Sat Aug 29 09:30:10 2020
+++ src/usr.bin/make/dir.c Sat Aug 29 10:12:06 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: dir.c,v 1.121 2020/08/29 09:30:10 rillig Exp $ */
+/* $NetBSD: dir.c,v 1.122 2020/08/29 10:12:06 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -70,14 +70,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: dir.c,v 1.121 2020/08/29 09:30:10 rillig Exp $";
+static char rcsid[] = "$NetBSD: dir.c,v 1.122 2020/08/29 10:12:06 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)dir.c 8.2 (Berkeley) 1/2/94";
#else
-__RCSID("$NetBSD: dir.c,v 1.121 2020/08/29 09:30:10 rillig Exp $");
+__RCSID("$NetBSD: dir.c,v 1.122 2020/08/29 10:12:06 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -517,7 +517,7 @@ Dir_SetPATH(void)
/* See if the Path structure describes the same directory as the
* given one by comparing their names. Called from Dir_AddDir via
- * Lst_FindB when searching the list of open directories. */
+ * Lst_Find when searching the list of open directories. */
static Boolean
DirFindName(const void *p, const void *desiredName)
{
@@ -1549,7 +1549,7 @@ Dir_AddDir(Lst path, const char *name)
struct dirent *dp; /* entry in directory */
if (path != NULL && strcmp(name, ".DOTLAST") == 0) {
- ln = Lst_FindB(path, DirFindName, name);
+ ln = Lst_Find(path, DirFindName, name);
if (ln != NULL)
return Lst_Datum(ln);
@@ -1558,7 +1558,7 @@ Dir_AddDir(Lst path, const char *name)
}
if (path != NULL)
- ln = Lst_FindB(openDirectories, DirFindName, name);
+ ln = Lst_Find(openDirectories, DirFindName, name);
if (ln != NULL) {
p = Lst_Datum(ln);
if (Lst_Member(path, p) == NULL) {
Index: src/usr.bin/make/lst.c
diff -u src/usr.bin/make/lst.c:1.54 src/usr.bin/make/lst.c:1.55
--- src/usr.bin/make/lst.c:1.54 Sat Aug 29 10:06:23 2020
+++ src/usr.bin/make/lst.c Sat Aug 29 10:12:06 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: lst.c,v 1.54 2020/08/29 10:06:23 rillig Exp $ */
+/* $NetBSD: lst.c,v 1.55 2020/08/29 10:12:06 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -37,11 +37,11 @@
#include "make.h"
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: lst.c,v 1.54 2020/08/29 10:06:23 rillig Exp $";
+static char rcsid[] = "$NetBSD: lst.c,v 1.55 2020/08/29 10:12:06 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: lst.c,v 1.54 2020/08/29 10:06:23 rillig Exp $");
+__RCSID("$NetBSD: lst.c,v 1.55 2020/08/29 10:12:06 rillig Exp $");
#endif /* not lint */
#endif
@@ -378,9 +378,9 @@ Lst_IsEmpty(Lst list)
/* Return the first node from the list for which the match function returns
* TRUE, or NULL if none of the nodes matched. */
LstNode
-Lst_FindB(Lst list, LstFindBProc match, const void *matchArgs)
+Lst_Find(Lst list, LstFindProc match, const void *matchArgs)
{
- return Lst_FindFromB(list, Lst_First(list), match, matchArgs);
+ return Lst_FindFrom(list, Lst_First(list), match, matchArgs);
}
/* Return the first node from the list, starting at the given node, for which
@@ -389,7 +389,7 @@ Lst_FindB(Lst list, LstFindBProc match,
* The start node may be NULL, in which case nothing is found. This allows
* for passing Lst_First or Lst_Succ as the start node. */
LstNode
-Lst_FindFromB(Lst list, LstNode node, LstFindBProc match, const void *matchArgs)
+Lst_FindFrom(Lst list, LstNode node, LstFindProc match, const void *matchArgs)
{
LstNode tln;
Index: src/usr.bin/make/lst.h
diff -u src/usr.bin/make/lst.h:1.55 src/usr.bin/make/lst.h:1.56
--- src/usr.bin/make/lst.h:1.55 Sat Aug 29 10:06:23 2020
+++ src/usr.bin/make/lst.h Sat Aug 29 10:12:06 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: lst.h,v 1.55 2020/08/29 10:06:23 rillig Exp $ */
+/* $NetBSD: lst.h,v 1.56 2020/08/29 10:12:06 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -92,8 +92,7 @@ typedef struct ListNode *LstNode;
typedef void *LstCopyProc(void *);
typedef void LstFreeProc(void *);
-typedef int LstFindProc(const void *, const void *);
-typedef Boolean LstFindBProc(const void *, const void *);
+typedef Boolean LstFindProc(const void *, const void *);
typedef int LstActionProc(void *, void *);
/*
@@ -146,9 +145,9 @@ void *Lst_Datum(LstNode);
* Functions for entire lists
*/
/* Find an element in a list */
-LstNode Lst_FindB(Lst, LstFindBProc, const void *);
+LstNode Lst_Find(Lst, LstFindProc, const void *);
/* Find an element starting from somewhere */
-LstNode Lst_FindFromB(Lst, LstNode, LstFindBProc, const void *);
+LstNode Lst_FindFrom(Lst, LstNode, LstFindProc, const void *);
/*
* See if the given datum is on the list. Returns the LstNode containing
* the datum
Index: src/usr.bin/make/main.c
diff -u src/usr.bin/make/main.c:1.325 src/usr.bin/make/main.c:1.326
--- src/usr.bin/make/main.c:1.325 Sat Aug 29 09:30:10 2020
+++ src/usr.bin/make/main.c Sat Aug 29 10:12:06 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.325 2020/08/29 09:30:10 rillig Exp $ */
+/* $NetBSD: main.c,v 1.326 2020/08/29 10:12:06 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,7 +69,7 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: main.c,v 1.325 2020/08/29 09:30:10 rillig Exp $";
+static char rcsid[] = "$NetBSD: main.c,v 1.326 2020/08/29 10:12:06 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
@@ -81,7 +81,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 19
#if 0
static char sccsid[] = "@(#)main.c 8.3 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: main.c,v 1.325 2020/08/29 09:30:10 rillig Exp $");
+__RCSID("$NetBSD: main.c,v 1.326 2020/08/29 10:12:06 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -787,7 +787,7 @@ Main_SetVarObjdir(const char *var, const
}
/* Read and parse the makefile.
- * Return TRUE if reading the makefile succeeded, for Lst_FindB. */
+ * Return TRUE if reading the makefile succeeded, for Lst_Find. */
static Boolean
ReadMakefileSucceeded(const void *fname, const void *unused)
{
@@ -795,7 +795,7 @@ ReadMakefileSucceeded(const void *fname,
}
/* Read and parse the makefile.
- * Return TRUE if reading the makefile failed, for Lst_FindB. */
+ * Return TRUE if reading the makefile failed, for Lst_Find. */
static Boolean
ReadMakefileFailed(const void *fname, const void *unused)
{
@@ -1335,7 +1335,7 @@ main(int argc, char **argv)
if (Lst_IsEmpty(sysMkPath))
Fatal("%s: no system rules (%s).", progname,
_PATH_DEFSYSMK);
- ln = Lst_FindB(sysMkPath, ReadMakefileSucceeded, NULL);
+ ln = Lst_Find(sysMkPath, ReadMakefileSucceeded, NULL);
if (ln == NULL)
Fatal("%s: cannot open %s.", progname,
(char *)Lst_Datum(Lst_First(sysMkPath)));
@@ -1344,7 +1344,7 @@ main(int argc, char **argv)
if (!Lst_IsEmpty(makefiles)) {
LstNode ln;
- ln = Lst_FindB(makefiles, ReadMakefileFailed, NULL);
+ ln = Lst_Find(makefiles, ReadMakefileFailed, NULL);
if (ln != NULL)
Fatal("%s: cannot open %s.", progname,
(char *)Lst_Datum(ln));
@@ -1353,7 +1353,7 @@ main(int argc, char **argv)
VAR_CMD, VARE_WANTRES);
if (p1) {
(void)str2Lst_Append(makefiles, p1, NULL);
- (void)Lst_FindB(makefiles, ReadMakefileSucceeded, NULL);
+ (void)Lst_Find(makefiles, ReadMakefileSucceeded, NULL);
free(p1);
}
}
Index: src/usr.bin/make/meta.c
diff -u src/usr.bin/make/meta.c:1.108 src/usr.bin/make/meta.c:1.109
--- src/usr.bin/make/meta.c:1.108 Sat Aug 29 10:06:23 2020
+++ src/usr.bin/make/meta.c Sat Aug 29 10:12:06 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: meta.c,v 1.108 2020/08/29 10:06:23 rillig Exp $ */
+/* $NetBSD: meta.c,v 1.109 2020/08/29 10:12:06 rillig Exp $ */
/*
* Implement 'meta' mode.
@@ -1318,13 +1318,13 @@ meta_oodate(GNode *gn, Boolean oodate)
case 'D': /* unlink */
if (*p == '/' && !Lst_IsEmpty(missingFiles)) {
/* remove any missingFiles entries that match p */
- ln = Lst_FindB(missingFiles, path_match, p);
+ ln = Lst_Find(missingFiles, path_match, p);
if (ln != NULL) {
LstNode nln;
char *tp;
do {
- nln = Lst_FindFromB(missingFiles, Lst_Succ(ln),
+ nln = Lst_FindFrom(missingFiles, Lst_Succ(ln),
path_match, p);
tp = Lst_Datum(ln);
Lst_Remove(missingFiles, ln);
@@ -1395,7 +1395,7 @@ meta_oodate(GNode *gn, Boolean oodate)
if ((link_src != NULL && cached_lstat(p, &fs) < 0) ||
(link_src == NULL && cached_stat(p, &fs) < 0)) {
if (!meta_ignore(gn, p)) {
- if (Lst_FindB(missingFiles, string_match, p) == NULL)
+ if (Lst_Find(missingFiles, string_match, p) == NULL)
Lst_Append(missingFiles, bmake_strdup(p));
}
}
@@ -1481,7 +1481,7 @@ meta_oodate(GNode *gn, Boolean oodate)
* A referenced file outside of CWD is missing.
* We cannot catch every eventuality here...
*/
- if (Lst_FindB(missingFiles, string_match, p) == NULL)
+ if (Lst_Find(missingFiles, string_match, p) == NULL)
Lst_Append(missingFiles, bmake_strdup(p));
}
}
Index: src/usr.bin/make/suff.c
diff -u src/usr.bin/make/suff.c:1.129 src/usr.bin/make/suff.c:1.130
--- src/usr.bin/make/suff.c:1.129 Sat Aug 29 10:06:23 2020
+++ src/usr.bin/make/suff.c Sat Aug 29 10:12:06 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: suff.c,v 1.129 2020/08/29 10:06:23 rillig Exp $ */
+/* $NetBSD: suff.c,v 1.130 2020/08/29 10:12:06 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: suff.c,v 1.129 2020/08/29 10:06:23 rillig Exp $";
+static char rcsid[] = "$NetBSD: suff.c,v 1.130 2020/08/29 10:12:06 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)suff.c 8.4 (Berkeley) 3/21/94";
#else
-__RCSID("$NetBSD: suff.c,v 1.129 2020/08/29 10:06:23 rillig Exp $");
+__RCSID("$NetBSD: suff.c,v 1.130 2020/08/29 10:12:06 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -294,7 +294,7 @@ SuffSuffGetSuffix(const Suff *s, const S
return p1 == s->name - 1 ? p2 : NULL;
}
-/* Predicate form of SuffSuffGetSuffix, for Lst_FindB. */
+/* Predicate form of SuffSuffGetSuffix, for Lst_Find. */
static Boolean
SuffSuffIsSuffix(const void *s, const void *sd)
{
@@ -546,9 +546,9 @@ SuffParseTransform(char *str, Suff **src
*/
for (;;) {
if (srcLn == NULL) {
- srcLn = Lst_FindB(sufflist, SuffSuffIsPrefix, str);
+ srcLn = Lst_Find(sufflist, SuffSuffIsPrefix, str);
} else {
- srcLn = Lst_FindFromB(sufflist, Lst_Succ(srcLn),
+ srcLn = Lst_FindFrom(sufflist, Lst_Succ(srcLn),
SuffSuffIsPrefix, str);
}
if (srcLn == NULL) {
@@ -577,7 +577,7 @@ SuffParseTransform(char *str, Suff **src
single = src;
singleLn = srcLn;
} else {
- targLn = Lst_FindB(sufflist, SuffSuffHasName, str2);
+ targLn = Lst_Find(sufflist, SuffSuffHasName, str2);
if (targLn != NULL) {
*srcPtr = src;
*targPtr = Lst_Datum(targLn);
@@ -637,7 +637,7 @@ Suff_AddTransform(char *line)
*t; /* target suffix */
LstNode ln; /* Node for existing transformation */
- ln = Lst_FindB(transforms, SuffGNHasName, line);
+ ln = Lst_Find(transforms, SuffGNHasName, line);
if (ln == NULL) {
/*
* Make a new graph node for the transformation. It will be filled in
@@ -786,7 +786,7 @@ SuffRebuildGraph(void *transformp, void
*/
cp = UNCONST(SuffStrIsPrefix(s->name, transform->name));
if (cp != NULL) {
- ln = Lst_FindB(sufflist, SuffSuffHasName, cp);
+ ln = Lst_Find(sufflist, SuffSuffHasName, cp);
if (ln != NULL) {
/*
* Found target. Link in and return, since it can't be anything
@@ -810,7 +810,7 @@ SuffRebuildGraph(void *transformp, void
* Null-terminate the source suffix in order to find it.
*/
cp[1] = '\0';
- ln = Lst_FindB(sufflist, SuffSuffHasName, transform->name);
+ ln = Lst_Find(sufflist, SuffSuffHasName, transform->name);
/*
* Replace the start of the target suffix
*/
@@ -913,7 +913,7 @@ Suff_AddSuffix(char *str, GNode **gn)
LstNode ln;
GNodeSuff gs;
- ln = Lst_FindB(sufflist, SuffSuffHasName, str);
+ ln = Lst_Find(sufflist, SuffSuffHasName, str);
if (ln == NULL) {
s = SuffNew(str);
@@ -955,7 +955,7 @@ Suff_GetPath(char *sname)
LstNode ln;
Suff *s;
- ln = Lst_FindB(sufflist, SuffSuffHasName, sname);
+ ln = Lst_Find(sufflist, SuffSuffHasName, sname);
if (ln == NULL) {
return NULL;
} else {
@@ -1050,7 +1050,7 @@ Suff_AddInclude(char *sname)
LstNode ln;
Suff *s;
- ln = Lst_FindB(sufflist, SuffSuffHasName, sname);
+ ln = Lst_Find(sufflist, SuffSuffHasName, sname);
if (ln != NULL) {
s = Lst_Datum(ln);
s->flags |= SUFF_INCLUDE;
@@ -1082,7 +1082,7 @@ Suff_AddLib(char *sname)
LstNode ln;
Suff *s;
- ln = Lst_FindB(sufflist, SuffSuffHasName, sname);
+ ln = Lst_Find(sufflist, SuffSuffHasName, sname);
if (ln != NULL) {
s = Lst_Datum(ln);
s->flags |= SUFF_LIBRARY;
@@ -1387,7 +1387,7 @@ SuffFindCmds(Src *targ, Lst slst)
* The node matches the prefix ok, see if it has a known
* suffix.
*/
- ln = Lst_FindB(sufflist, SuffSuffHasName, &cp[prefLen]);
+ ln = Lst_Find(sufflist, SuffSuffHasName, &cp[prefLen]);
if (ln == NULL)
continue;
/*
@@ -1677,7 +1677,7 @@ Suff_FindPath(GNode* gn)
LstNode ln;
sd.len = strlen(gn->name);
sd.ename = gn->name + sd.len;
- ln = Lst_FindB(sufflist, SuffSuffIsSuffix, &sd);
+ ln = Lst_Find(sufflist, SuffSuffIsSuffix, &sd);
if (DEBUG(SUFF)) {
fprintf(debug_file, "Wildcard expanding \"%s\"...", gn->name);
@@ -1742,7 +1742,7 @@ SuffApplyTransform(GNode *tGn, GNode *sG
* Locate the transformation rule itself
*/
tname = str_concat2(s->name, t->name);
- ln = Lst_FindB(transforms, SuffGNHasName, tname);
+ ln = Lst_Find(transforms, SuffGNHasName, tname);
free(tname);
if (ln == NULL) {
@@ -1907,7 +1907,7 @@ SuffFindArchiveDeps(GNode *gn, Lst slst)
*/
sd.len = eoarch - gn->name;
sd.ename = eoarch;
- ln = Lst_FindB(ms->parents, SuffSuffIsSuffix, &sd);
+ ln = Lst_Find(ms->parents, SuffSuffIsSuffix, &sd);
if (ln != NULL) {
/*
@@ -2017,7 +2017,7 @@ SuffFindNormalDeps(GNode *gn, Lst slst)
/*
* Look for next possible suffix...
*/
- ln = Lst_FindFromB(sufflist, ln, SuffSuffIsSuffix, &sd);
+ ln = Lst_FindFrom(sufflist, ln, SuffSuffIsSuffix, &sd);
if (ln != NULL) {
int prefLen; /* Length of the prefix */
@@ -2385,7 +2385,7 @@ SuffFindDeps(GNode *gn, Lst slst)
LstNode ln;
Suff *s;
- ln = Lst_FindB(sufflist, SuffSuffHasName, LIBSUFF);
+ ln = Lst_Find(sufflist, SuffSuffHasName, LIBSUFF);
if (gn->suffix)
gn->suffix->refCount--;
if (ln != NULL) {
@@ -2429,7 +2429,7 @@ Suff_SetNull(char *name)
Suff *s;
LstNode ln;
- ln = Lst_FindB(sufflist, SuffSuffHasName, name);
+ ln = Lst_Find(sufflist, SuffSuffHasName, name);
if (ln != NULL) {
s = Lst_Datum(ln);
if (suffNull != NULL) {
