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

make(1): improve variable names in Arch_ParseArchive 

The variable buf used to be a Buffer, now it is a simple string pointer.
This commit is contained in:
rillig 2020-12-04 14:51:46 +00:00
parent 65a2faf0b6
commit 2cf4367e86
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
/* $NetBSD: arch.c,v 1.183 2020/12/04 14:39:56 rillig Exp $ */ /* $NetBSD: arch.c,v 1.184 2020/12/04 14:51:46 rillig Exp $ */
/* /*
* Copyright (c) 1988, 1989, 1990, 1993 * Copyright (c) 1988, 1989, 1990, 1993
@ -125,7 +125,7 @@
#include "config.h" #include "config.h"
/* "@(#)arch.c 8.2 (Berkeley) 1/2/94" */ /* "@(#)arch.c 8.2 (Berkeley) 1/2/94" */
MAKE_RCSID("$NetBSD: arch.c,v 1.183 2020/12/04 14:39:56 rillig Exp $"); MAKE_RCSID("$NetBSD: arch.c,v 1.184 2020/12/04 14:51:46 rillig Exp $");
typedef struct List ArchList; typedef struct List ArchList;
typedef struct ListNode ArchListNode; typedef struct ListNode ArchListNode;
@ -304,9 +304,9 @@ Arch_ParseArchive(char **pp, GNodeList *gns, GNode *ctxt)
* thing would be taken care of later. * thing would be taken care of later.
*/ */
if (doSubst) { if (doSubst) {
char *buf; char *fullName;
char *sacrifice; char *p;
char *oldMemName = memName; char *unexpandedMemName = memName;
(void)Var_Subst(memName, ctxt, (void)Var_Subst(memName, ctxt,
VARE_WANTRES | VARE_UNDEFERR, VARE_WANTRES | VARE_UNDEFERR,
@ -317,27 +317,29 @@ Arch_ParseArchive(char **pp, GNodeList *gns, GNode *ctxt)
* Now form an archive spec and recurse to deal with * Now form an archive spec and recurse to deal with
* nested variables and multi-word variable values. * nested variables and multi-word variable values.
*/ */
sacrifice = str_concat4(libName, "(", memName, ")"); fullName = str_concat4(libName, "(", memName, ")");
buf = sacrifice; p = fullName;
if (strchr(memName, '$') != NULL && if (strchr(memName, '$') != NULL &&
strcmp(memName, oldMemName) == 0) { strcmp(memName, unexpandedMemName) == 0) {
/* /*
* Must contain dynamic sources, so we can't * Must contain dynamic sources, so we can't
* deal with it now. Just create an ARCHV node * deal with it now. Just create an ARCHV node
* for the thing and let SuffExpandChildren * for the thing and let SuffExpandChildren
* handle it. * handle it.
*/ */
gn = Targ_GetNode(buf); gn = Targ_GetNode(fullName);
gn->type |= OP_ARCHV; gn->type |= OP_ARCHV;
Lst_Append(gns, gn); Lst_Append(gns, gn);
} else if (!Arch_ParseArchive(&sacrifice, gns, ctxt)) { } else if (!Arch_ParseArchive(&p, gns, ctxt)) {
/* Error in nested call. */ /* Error in nested call. */
free(buf); free(fullName);
/* XXX: does unexpandedMemName leak? */
return FALSE; return FALSE;
} }
free(buf); free(fullName);
/* XXX: does unexpandedMemName leak? */
} else if (Dir_HasWildcards(memName)) { } else if (Dir_HasWildcards(memName)) {
StringList members = LST_INIT; StringList members = LST_INIT;