summaryrefslogtreecommitdiffstats
path: root/usr.bin/make/arch.c
diff options
context:
space:
mode:
authorharti <harti@FreeBSD.org>2005-03-23 12:56:15 +0000
committerharti <harti@FreeBSD.org>2005-03-23 12:56:15 +0000
commit4fa1581ab5455f552c5bb19ec85108fda265d3e3 (patch)
tree9063b6b0025218d6244ad30a8bfa72a85bc4ba1b /usr.bin/make/arch.c
parent6074d030e0cfd6d506a874b419df9b8e939395f3 (diff)
downloadFreeBSD-src-4fa1581ab5455f552c5bb19ec85108fda265d3e3.zip
FreeBSD-src-4fa1581ab5455f552c5bb19ec85108fda265d3e3.tar.gz
Make paths an explicite datatype instead of using the generic Lst.
A Path is now a TAILQ of PathElements each of which just points to a reference counted directory. Rename all functions dealing with Paths from the Dir_ prefix to a Path_ prefix.
Diffstat (limited to 'usr.bin/make/arch.c')
-rw-r--r--usr.bin/make/arch.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/make/arch.c b/usr.bin/make/arch.c
index 6cc89b7..9b993df 100644
--- a/usr.bin/make/arch.c
+++ b/usr.bin/make/arch.c
@@ -336,7 +336,7 @@ Arch_ParseArchive(char **linePtr, Lst *nodeLst, GNode *ctxt)
nameBuf = emalloc(sz);
- Dir_Expand(memName, &dirSearchPath, &members);
+ Path_Expand(memName, &dirSearchPath, &members);
while (!Lst_IsEmpty(&members)) {
member = Lst_DeQueue(&members);
nsz = strlen(libName) + strlen(member) + 3;
@@ -1054,7 +1054,7 @@ Arch_MemMTime(GNode *gn)
*-----------------------------------------------------------------------
*/
void
-Arch_FindLib(GNode *gn, Lst *path)
+Arch_FindLib(GNode *gn, struct Path *path)
{
char *libName; /* file name for archive */
size_t sz;
@@ -1063,7 +1063,7 @@ Arch_FindLib(GNode *gn, Lst *path)
libName = emalloc(sz);
snprintf(libName, sz, "lib%s.a", &gn->name[2]);
- gn->path = Dir_FindFile(libName, path);
+ gn->path = Path_FindFile(libName, path);
free(libName);
OpenPOWER on IntegriCloud