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

make(1): replace FStr_Assign with separate initialization functions

Browse Source 
In GetVarnamesToUnexport, there is no need to free the local FStr since
the only place where it is assigned an allocated string is at the very
end.

Having separate functions for the two main use cases of a possibly
allocated string makes the calling code simpler.  This is a preparatory
commit for making the memory allocation in ApplyModifiers easier to
understand.
This commit is contained in:
rillig 2020-12-20 00:57:29 +00:00
parent e0de850d21
commit 19824f4691
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
usr.bin/make/var.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: var.c,v 1.738 2020/12/20 00:47:21 rillig Exp $ */ /* $NetBSD: var.c,v 1.739 2020/12/20 00:57:29 rillig Exp $ */
/* /*
* Copyright (c) 1988, 1989, 1990, 1993 * Copyright (c) 1988, 1989, 1990, 1993
@ -131,7 +131,7 @@
#include "metachar.h" #include "metachar.h"
/* "@(#)var.c 8.3 (Berkeley) 3/19/94" */ /* "@(#)var.c 8.3 (Berkeley) 3/19/94" */
MAKE_RCSID("$NetBSD: var.c,v 1.738 2020/12/20 00:47:21 rillig Exp $"); MAKE_RCSID("$NetBSD: var.c,v 1.739 2020/12/20 00:57:29 rillig Exp $");
/* A string that may need to be freed after use. */ /* A string that may need to be freed after use. */
typedef struct FStr { typedef struct FStr {
@ -305,14 +305,18 @@ ENUM_FLAGS_RTTI_6(VarFlags,
static VarExportedMode var_exportedVars = VAR_EXPORTED_NONE; static VarExportedMode var_exportedVars = VAR_EXPORTED_NONE;
#define FSTR_INIT { NULL, NULL } /* Return an FStr that is the sole owner of str. */
static FStr
static void FStr_InitOwn(char *str)
FStr_Assign(FStr *fstr, const char *str, void *freeIt)
{ {
free(fstr->freeIt); return (FStr){ str, str };
fstr->str = str; }
fstr->freeIt = freeIt;
/* Return an FStr that refers to the shared str. */
static FStr
FStr_InitRefer(const char *str)
{
return (FStr){ str, NULL };
} }
static void static void
@ -791,7 +795,7 @@ GetVarnamesToUnexport(Boolean isEnv, const char *arg,
FStr *out_varnames, UnexportWhat *out_what) FStr *out_varnames, UnexportWhat *out_what)
{ {
UnexportWhat what; UnexportWhat what;
FStr varnames = FSTR_INIT; FStr varnames = FStr_InitRefer("");
if (isEnv) { if (isEnv) {
if (arg[0] != '\0') { if (arg[0] != '\0') {
@ -804,7 +808,7 @@ GetVarnamesToUnexport(Boolean isEnv, const char *arg,
} else { } else {
what = arg[0] != '\0' ? UNEXPORT_NAMED : UNEXPORT_ALL; what = arg[0] != '\0' ? UNEXPORT_NAMED : UNEXPORT_ALL;
if (what == UNEXPORT_NAMED) if (what == UNEXPORT_NAMED)
FStr_Assign(&varnames, arg, NULL); varnames = FStr_InitRefer(arg);
} }
if (what != UNEXPORT_NAMED) { if (what != UNEXPORT_NAMED) {
@ -813,7 +817,7 @@ GetVarnamesToUnexport(Boolean isEnv, const char *arg,
(void)Var_Subst("${" MAKE_EXPORTED ":O:u}", VAR_GLOBAL, (void)Var_Subst("${" MAKE_EXPORTED ":O:u}", VAR_GLOBAL,
VARE_WANTRES, &expanded); VARE_WANTRES, &expanded);
/* TODO: handle errors */ /* TODO: handle errors */
FStr_Assign(&varnames, expanded, expanded); varnames = FStr_InitOwn(expanded);
} }
*out_varnames = varnames; *out_varnames = varnames;