Module Name: src
Committed By: rillig
Date: Sat Nov 7 13:03:58 UTC 2020
Modified Files:
src/usr.bin/make: arch.c
Log Message:
make(1): rename local variable in Arch_ParseArchive
To generate a diff of this commit:
cvs rdiff -u -r1.161 -r1.162 src/usr.bin/make/arch.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.161 src/usr.bin/make/arch.c:1.162
--- src/usr.bin/make/arch.c:1.161 Sat Nov 7 12:58:55 2020
+++ src/usr.bin/make/arch.c Sat Nov 7 13:03:58 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: arch.c,v 1.161 2020/11/07 12:58:55 rillig Exp $ */
+/* $NetBSD: arch.c,v 1.162 2020/11/07 13:03:58 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -125,7 +125,7 @@
#include "config.h"
/* "@(#)arch.c 8.2 (Berkeley) 1/2/94" */
-MAKE_RCSID("$NetBSD: arch.c,v 1.161 2020/11/07 12:58:55 rillig Exp $");
+MAKE_RCSID("$NetBSD: arch.c,v 1.162 2020/11/07 13:03:58 rillig Exp $");
typedef struct List ArchList;
typedef struct ListNode ArchListNode;
@@ -191,12 +191,12 @@ Arch_ParseArchive(char **pp, GNodeList *
char *libName_freeIt = NULL;
char *memName; /* Member-part of specification */
char saveChar; /* Ending delimiter of member-name */
- Boolean subLibName; /* TRUE if libName should have/had
- * variable substitution performed on it */
+ Boolean expandLibName; /* Whether the parsed libName contains
+ * variable expressions that need to be
+ * expanded */
libName = *pp;
-
- subLibName = FALSE;
+ expandLibName = FALSE;
for (cp = libName; *cp != '(' && *cp != '\0';) {
if (*cp == '$') {
@@ -218,14 +218,14 @@ Arch_ParseArchive(char **pp, GNodeList *
if (isError)
return FALSE;
- subLibName = TRUE;
+ expandLibName = TRUE;
cp += nested_p - cp;
} else
cp++;
}
*cp++ = '\0';
- if (subLibName) {
+ if (expandLibName) {
(void)Var_Subst(libName, ctxt, VARE_UNDEFERR|VARE_WANTRES, &libName);
/* TODO: handle errors */
libName_freeIt = libName;
