diff options
| author | rillig <rillig@NetBSD.org> | 2020-10-28 03:21:25 +0000 |
|---|---|---|
| committer | rillig <rillig@NetBSD.org> | 2020-10-28 03:21:25 +0000 |
| commit | 5656d8b020f6fadbcd54e1170af95965fa9a4191 (patch) | |
| tree | e623a28c6e212af1e2cf791c6a79b8c44604d26f /usr.bin/make/parse.c | |
| parent | cfbbb4d6abfbc1f902c922e94f48dc0dc332e6da (diff) | |
make(1): rename defIncPath to defSysIncPath
There are two variables, parseIncPath and sysIncPath, which made the
name defIncPath ambiguous.
Diffstat (limited to 'usr.bin/make/parse.c')
| -rw-r--r-- | usr.bin/make/parse.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/usr.bin/make/parse.c b/usr.bin/make/parse.c index 4122af82dc3..ce48752544a 100644 --- a/usr.bin/make/parse.c +++ b/usr.bin/make/parse.c @@ -1,4 +1,4 @@ -/* $NetBSD: parse.c,v 1.408 2020/10/28 03:12:54 rillig Exp $ */ +/* $NetBSD: parse.c,v 1.409 2020/10/28 03:21:25 rillig Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -117,7 +117,7 @@ #include "pathnames.h" /* "@(#)parse.c 8.3 (Berkeley) 3/19/94" */ -MAKE_RCSID("$NetBSD: parse.c,v 1.408 2020/10/28 03:12:54 rillig Exp $"); +MAKE_RCSID("$NetBSD: parse.c,v 1.409 2020/10/28 03:21:25 rillig Exp $"); /* types and constants */ @@ -280,10 +280,10 @@ CurFile(void) return GetInclude(includes.len - 1); } -/* include paths (lists of directories) */ +/* include paths */ SearchPath *parseIncPath; /* dirs for "..." includes */ SearchPath *sysIncPath; /* dirs for <...> includes */ -SearchPath *defIncPath; /* default for sysIncPath */ +SearchPath *defSysIncPath; /* default for sysIncPath */ /* parser tables */ @@ -2206,7 +2206,7 @@ Parse_include_file(char *file, Boolean isSystem, Boolean depinc, int silent) /* * Look for it on the system path */ - SearchPath *path = Lst_IsEmpty(sysIncPath) ? defIncPath : sysIncPath; + SearchPath *path = Lst_IsEmpty(sysIncPath) ? defSysIncPath : sysIncPath; fullname = Dir_FindFile(file, path); } @@ -3144,7 +3144,7 @@ Parse_Init(void) mainNode = NULL; parseIncPath = Lst_New(); sysIncPath = Lst_New(); - defIncPath = Lst_New(); + defSysIncPath = Lst_New(); Vector_Init(&includes, sizeof(IFile)); #ifdef CLEANUP targCmds = Lst_New(); @@ -3158,7 +3158,7 @@ Parse_End(void) #ifdef CLEANUP Lst_Destroy(targCmds, free); assert(targets == NULL); - Lst_Destroy(defIncPath, Dir_Destroy); + Lst_Destroy(defSysIncPath, Dir_Destroy); Lst_Destroy(sysIncPath, Dir_Destroy); Lst_Destroy(parseIncPath, Dir_Destroy); assert(includes.len == 0); |
