Module Name: src
Committed By: rillig
Date: Fri Oct 30 20:30:44 UTC 2020
Modified Files:
src/usr.bin/make: arch.c compat.c cond.c job.c main.c make.c meta.c
nonints.h parse.c suff.c trace.c var.c
Log Message:
make(1): change char * to void * in Var_Value
The only purpose of the parameter freeIt is to free the memory
associated with the return value. To do this, no pointer arithmetic is
needed. Therefore, change to a void pointer, to catch accidental use of
that pointer.
To generate a diff of this commit:
cvs rdiff -u -r1.148 -r1.149 src/usr.bin/make/arch.c
cvs rdiff -u -r1.169 -r1.170 src/usr.bin/make/compat.c
cvs rdiff -u -r1.172 -r1.173 src/usr.bin/make/cond.c
cvs rdiff -u -r1.295 -r1.296 src/usr.bin/make/job.c
cvs rdiff -u -r1.411 -r1.412 src/usr.bin/make/main.c
cvs rdiff -u -r1.182 -r1.183 src/usr.bin/make/make.c
cvs rdiff -u -r1.132 -r1.133 src/usr.bin/make/meta.c
cvs rdiff -u -r1.146 -r1.147 src/usr.bin/make/nonints.h
cvs rdiff -u -r1.412 -r1.413 src/usr.bin/make/parse.c
cvs rdiff -u -r1.228 -r1.229 src/usr.bin/make/suff.c
cvs rdiff -u -r1.19 -r1.20 src/usr.bin/make/trace.c
cvs rdiff -u -r1.605 -r1.606 src/usr.bin/make/var.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.148 src/usr.bin/make/arch.c:1.149
--- src/usr.bin/make/arch.c:1.148 Fri Oct 30 16:48:58 2020
+++ src/usr.bin/make/arch.c Fri Oct 30 20:30:44 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: arch.c,v 1.148 2020/10/30 16:48:58 rillig Exp $ */
+/* $NetBSD: arch.c,v 1.149 2020/10/30 20:30:44 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -130,7 +130,7 @@
#include "config.h"
/* "@(#)arch.c 8.2 (Berkeley) 1/2/94" */
-MAKE_RCSID("$NetBSD: arch.c,v 1.148 2020/10/30 16:48:58 rillig Exp $");
+MAKE_RCSID("$NetBSD: arch.c,v 1.149 2020/10/30 20:30:44 rillig Exp $");
#ifdef TARGET_MACHINE
#undef MAKE_MACHINE
@@ -861,7 +861,7 @@ Arch_Touch(GNode *gn)
{
FILE *arch; /* Stream open to archive, positioned properly */
struct ar_hdr arh; /* Current header describing member */
- char *p1, *p2;
+ void *p1, *p2;
arch = ArchFindMember(Var_Value(ARCHIVE, gn, &p1),
Var_Value(MEMBER, gn, &p2),
@@ -921,7 +921,7 @@ Arch_MTime(GNode *gn)
{
struct ar_hdr *arhPtr; /* Header of desired member */
time_t modTime; /* Modification time as an integer */
- char *p1, *p2;
+ void *p1, *p2;
arhPtr = ArchStatMember(Var_Value(ARCHIVE, gn, &p1),
Var_Value(MEMBER, gn, &p2),
Index: src/usr.bin/make/compat.c
diff -u src/usr.bin/make/compat.c:1.169 src/usr.bin/make/compat.c:1.170
--- src/usr.bin/make/compat.c:1.169 Mon Oct 26 21:34:10 2020
+++ src/usr.bin/make/compat.c Fri Oct 30 20:30:44 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: compat.c,v 1.169 2020/10/26 21:34:10 rillig Exp $ */
+/* $NetBSD: compat.c,v 1.170 2020/10/30 20:30:44 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -96,7 +96,7 @@
#include "pathnames.h"
/* "@(#)compat.c 8.2 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: compat.c,v 1.169 2020/10/26 21:34:10 rillig Exp $");
+MAKE_RCSID("$NetBSD: compat.c,v 1.170 2020/10/30 20:30:44 rillig Exp $");
static GNode *curTarg = NULL;
static pid_t compatChild;
@@ -110,7 +110,7 @@ static void
CompatDeleteTarget(GNode *gn)
{
if (gn != NULL && !Targ_Precious(gn)) {
- char *file_freeIt;
+ void *file_freeIt;
const char *file = Var_Value(TARGET, gn, &file_freeIt);
if (!opts.noExecute && eunlink(file) != -1) {
@@ -503,7 +503,7 @@ Compat_Make(GNode *gn, GNode *pgn)
}
if (Lst_FindDatum(gn->implicitParents, pgn) != NULL) {
- char *target_freeIt;
+ void *target_freeIt;
Var_Set(IMPSRC, Var_Value(TARGET, gn, &target_freeIt), pgn);
bmake_free(target_freeIt);
}
@@ -597,7 +597,7 @@ Compat_Make(GNode *gn, GNode *pgn)
pgn->flags &= ~(unsigned)REMAKE;
} else {
if (Lst_FindDatum(gn->implicitParents, pgn) != NULL) {
- char *target_freeIt;
+ void *target_freeIt;
const char *target = Var_Value(TARGET, gn, &target_freeIt);
Var_Set(IMPSRC, target != NULL ? target : "", pgn);
bmake_free(target_freeIt);
Index: src/usr.bin/make/cond.c
diff -u src/usr.bin/make/cond.c:1.172 src/usr.bin/make/cond.c:1.173
--- src/usr.bin/make/cond.c:1.172 Fri Oct 30 14:56:23 2020
+++ src/usr.bin/make/cond.c Fri Oct 30 20:30:44 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cond.c,v 1.172 2020/10/30 14:56:23 rillig Exp $ */
+/* $NetBSD: cond.c,v 1.173 2020/10/30 20:30:44 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -93,7 +93,7 @@
#include "dir.h"
/* "@(#)cond.c 8.2 (Berkeley) 1/2/94" */
-MAKE_RCSID("$NetBSD: cond.c,v 1.172 2020/10/30 14:56:23 rillig Exp $");
+MAKE_RCSID("$NetBSD: cond.c,v 1.173 2020/10/30 20:30:44 rillig Exp $");
/*
* The parsing of conditional expressions is based on this grammar:
@@ -283,7 +283,7 @@ ParseFuncArg(const char **pp, Boolean do
static Boolean
FuncDefined(size_t argLen MAKE_ATTR_UNUSED, const char *arg)
{
- char *freeIt;
+ void *freeIt;
Boolean result = Var_Value(arg, VAR_CMDLINE, &freeIt) != NULL;
bmake_free(freeIt);
return result;
Index: src/usr.bin/make/job.c
diff -u src/usr.bin/make/job.c:1.295 src/usr.bin/make/job.c:1.296
--- src/usr.bin/make/job.c:1.295 Fri Oct 30 15:39:17 2020
+++ src/usr.bin/make/job.c Fri Oct 30 20:30:44 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: job.c,v 1.295 2020/10/30 15:39:17 rillig Exp $ */
+/* $NetBSD: job.c,v 1.296 2020/10/30 20:30:44 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -143,7 +143,7 @@
#include "trace.h"
/* "@(#)job.c 8.2 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: job.c,v 1.295 2020/10/30 15:39:17 rillig Exp $");
+MAKE_RCSID("$NetBSD: job.c,v 1.296 2020/10/30 20:30:44 rillig Exp $");
/* A shell defines how the commands are run. All commands for a target are
* written into a single file, which is then given to the shell to execute
@@ -1193,7 +1193,7 @@ Job_CheckCommands(GNode *gn, void (*abor
*/
if ((DEFAULT != NULL) && !Lst_IsEmpty(DEFAULT->commands) &&
(gn->type & OP_SPECIAL) == 0) {
- char *p1;
+ void *p1;
/*
* Make only looks for a .DEFAULT if the node was never the
* target of an operator, so that's what we do too. If
Index: src/usr.bin/make/main.c
diff -u src/usr.bin/make/main.c:1.411 src/usr.bin/make/main.c:1.412
--- src/usr.bin/make/main.c:1.411 Fri Oct 30 15:39:17 2020
+++ src/usr.bin/make/main.c Fri Oct 30 20:30:44 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.411 2020/10/30 15:39:17 rillig Exp $ */
+/* $NetBSD: main.c,v 1.412 2020/10/30 20:30:44 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -118,7 +118,7 @@
#include "trace.h"
/* "@(#)main.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: main.c,v 1.411 2020/10/30 15:39:17 rillig Exp $");
+MAKE_RCSID("$NetBSD: main.c,v 1.412 2020/10/30 20:30:44 rillig Exp $");
#if defined(MAKE_NATIVE) && !defined(lint)
__COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993 "
"The Regents of the University of California. "
@@ -674,7 +674,7 @@ void
Main_ParseArgLine(const char *line)
{
Words words;
- char *p1;
+ void *p1;
const char *argv0 = Var_Value(".MAKE", VAR_GLOBAL, &p1);
char *buf;
@@ -742,7 +742,7 @@ Main_SetObjdir(const char *fmt, ...)
static Boolean
Main_SetVarObjdir(const char *var, const char *suffix)
{
- char *path_freeIt;
+ void *path_freeIt;
const char *path = Var_Value(var, VAR_CMDLINE, &path_freeIt);
const char *xpath;
char *xpath_freeIt;
@@ -857,7 +857,7 @@ PrintVar(const char *varname, Boolean ex
bmake_free(evalue);
} else {
- char *freeIt;
+ void *freeIt;
const char *value = Var_Value(varname, VAR_GLOBAL, &freeIt);
printf("%s\n", value ? value : "");
bmake_free(freeIt);
@@ -1029,7 +1029,7 @@ static void
HandlePWD(const struct stat *curdir_st)
{
char *pwd;
- char *prefix_freeIt, *makeobjdir_freeIt;
+ void *prefix_freeIt, *makeobjdir_freeIt;
const char *makeobjdir;
struct stat pwd_st;
@@ -1336,7 +1336,6 @@ main(int argc, char **argv)
{
Boolean outOfDate; /* FALSE if all targets up to date */
struct stat sa;
- char *p1;
const char *machine;
const char *machine_arch;
char *syspath = getenv("MAKESYSPATH");
@@ -1461,9 +1460,11 @@ main(int argc, char **argv)
* in a different format).
*/
#ifdef POSIX
- p1 = explode(getenv("MAKEFLAGS"));
- Main_ParseArgLine(p1);
- free(p1);
+ {
+ char *p1 = explode(getenv("MAKEFLAGS"));
+ Main_ParseArgLine(p1);
+ free(p1);
+ }
#else
Main_ParseArgLine(getenv("MAKE"));
#endif
@@ -1544,8 +1545,13 @@ main(int argc, char **argv)
MakeMode(NULL);
- Var_Append("MFLAGS", Var_Value(MAKEFLAGS, VAR_GLOBAL, &p1), VAR_GLOBAL);
- bmake_free(p1);
+ {
+ void *freeIt;
+ Var_Append("MFLAGS", Var_Value(MAKEFLAGS, VAR_GLOBAL, &freeIt),
+ VAR_GLOBAL);
+ bmake_free(freeIt);
+
+ }
InitMaxJobs();
@@ -2013,14 +2019,14 @@ cached_realpath(const char *pathname, ch
{
GNode *cache;
const char *rp;
- char *cp;
+ void *freeIt;
if (!pathname || !pathname[0])
return NULL;
cache = get_cached_realpaths();
- if ((rp = Var_Value(pathname, cache, &cp)) != NULL) {
+ if ((rp = Var_Value(pathname, cache, &freeIt)) != NULL) {
/* a hit */
strncpy(resolved, rp, MAXPATHLEN);
resolved[MAXPATHLEN - 1] = '\0';
@@ -2028,7 +2034,7 @@ cached_realpath(const char *pathname, ch
Var_Set(pathname, rp, cache);
} /* else should we negative-cache? */
- bmake_free(cp);
+ bmake_free(freeIt);
return rp ? resolved : NULL;
}
Index: src/usr.bin/make/make.c
diff -u src/usr.bin/make/make.c:1.182 src/usr.bin/make/make.c:1.183
--- src/usr.bin/make/make.c:1.182 Fri Oct 30 15:39:17 2020
+++ src/usr.bin/make/make.c Fri Oct 30 20:30:44 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: make.c,v 1.182 2020/10/30 15:39:17 rillig Exp $ */
+/* $NetBSD: make.c,v 1.183 2020/10/30 20:30:44 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -107,7 +107,7 @@
#include "job.h"
/* "@(#)make.c 8.1 (Berkeley) 6/6/93" */
-MAKE_RCSID("$NetBSD: make.c,v 1.182 2020/10/30 15:39:17 rillig Exp $");
+MAKE_RCSID("$NetBSD: make.c,v 1.183 2020/10/30 20:30:44 rillig Exp $");
/* Sequence # to detect recursion. */
static unsigned int checked = 1;
@@ -569,7 +569,7 @@ static void
UpdateImplicitParentsVars(GNode *cgn, const char *cname)
{
GNodeListNode *ln;
- char *cpref_freeIt;
+ void *cpref_freeIt;
const char *cpref = Var_Value(PREFIX, cgn, &cpref_freeIt);
for (ln = cgn->implicitParents->first; ln != NULL; ln = ln->next) {
@@ -615,7 +615,7 @@ Make_Update(GNode *cgn)
checked++;
{
- char *cname_freeIt;
+ void *cname_freeIt;
cname = Var_Value(TARGET, cgn, &cname_freeIt);
assert(cname_freeIt == NULL);
}
@@ -779,7 +779,7 @@ MakeAddAllSrc(GNode *cgn, GNode *pgn)
if ((cgn->type & (OP_EXEC|OP_USE|OP_USEBEFORE|OP_INVISIBLE)) == 0) {
const char *child, *allsrc;
- char *p1 = NULL, *p2 = NULL;
+ void *p1 = NULL, *p2 = NULL;
if (cgn->type & OP_ARCHV)
child = Var_Value(MEMBER, cgn, &p1);
@@ -855,7 +855,7 @@ Make_DoAllVar(GNode *gn)
}
if (gn->type & OP_JOIN) {
- char *p1;
+ void *p1;
Var_Set(TARGET, Var_Value(ALLSRC, gn, &p1), gn);
bmake_free(p1);
}
Index: src/usr.bin/make/meta.c
diff -u src/usr.bin/make/meta.c:1.132 src/usr.bin/make/meta.c:1.133
--- src/usr.bin/make/meta.c:1.132 Fri Oct 30 15:39:17 2020
+++ src/usr.bin/make/meta.c Fri Oct 30 20:30:44 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: meta.c,v 1.132 2020/10/30 15:39:17 rillig Exp $ */
+/* $NetBSD: meta.c,v 1.133 2020/10/30 20:30:44 rillig Exp $ */
/*
* Implement 'meta' mode.
@@ -326,7 +326,8 @@ is_submake(void *cmdp, void *gnp)
int rc = 0; /* keep looking */
if (!p_make) {
- p_make = Var_Value(".MAKE", gn, &cp);
+ void *dontFreeIt;
+ p_make = Var_Value(".MAKE", gn, &dontFreeIt);
p_len = strlen(p_make);
}
cp = strchr(cmd, '$');
@@ -473,7 +474,7 @@ meta_create(BuildMon *pbm, GNode *gn)
const char *tname;
char *fname;
const char *cp;
- char *p[5]; /* >= possible uses */
+ void *p[5]; /* >= possible uses */
int i;
mf.fp = NULL;
@@ -594,6 +595,7 @@ meta_mode_init(const char *make_mode)
{
static int once = 0;
char *cp;
+ void *freeIt;
useMeta = TRUE;
useFilemon = TRUE;
@@ -651,15 +653,15 @@ meta_mode_init(const char *make_mode)
/*
* We ignore any paths that match ${.MAKE.META.IGNORE_PATTERNS}
*/
- cp = NULL;
- if (Var_Value(MAKE_META_IGNORE_PATTERNS, VAR_GLOBAL, &cp)) {
+ freeIt = NULL;
+ if (Var_Value(MAKE_META_IGNORE_PATTERNS, VAR_GLOBAL, &freeIt)) {
metaIgnorePatterns = TRUE;
- bmake_free(cp);
+ bmake_free(freeIt);
}
- cp = NULL;
- if (Var_Value(MAKE_META_IGNORE_FILTER, VAR_GLOBAL, &cp)) {
+ freeIt = NULL;
+ if (Var_Value(MAKE_META_IGNORE_FILTER, VAR_GLOBAL, &freeIt)) {
metaIgnoreFilter = TRUE;
- bmake_free(cp);
+ bmake_free(freeIt);
}
}
@@ -1088,7 +1090,7 @@ meta_oodate(GNode *gn, Boolean oodate)
FILE *fp;
Boolean needOODATE = FALSE;
StringList *missingFiles;
- char *pa[4]; /* >= possible uses */
+ void *pa[4]; /* >= possible uses */
int i;
int have_filemon = FALSE;
@@ -1222,7 +1224,7 @@ meta_oodate(GNode *gn, Boolean oodate)
pid = atoi(p);
if (pid > 0 && pid != lastpid) {
const char *ldir;
- char *tp;
+ void *tp;
if (lastpid > 0) {
/* We need to remember these. */
@@ -1600,14 +1602,15 @@ meta_oodate(GNode *gn, Boolean oodate)
Lst_Destroy(missingFiles, free);
if (oodate && needOODATE) {
+ void *freeIt;
/*
* Target uses .OODATE which is empty; or we wouldn't be here.
* We have decided it is oodate, so .OODATE needs to be set.
* All we can sanely do is set it to .ALLSRC.
*/
Var_Delete(OODATE, gn);
- Var_Set(OODATE, Var_Value(ALLSRC, gn, &cp), gn);
- bmake_free(cp);
+ Var_Set(OODATE, Var_Value(ALLSRC, gn, &freeIt), gn);
+ bmake_free(freeIt);
}
oodate_out:
Index: src/usr.bin/make/nonints.h
diff -u src/usr.bin/make/nonints.h:1.146 src/usr.bin/make/nonints.h:1.147
--- src/usr.bin/make/nonints.h:1.146 Fri Oct 23 20:04:56 2020
+++ src/usr.bin/make/nonints.h Fri Oct 30 20:30:44 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: nonints.h,v 1.146 2020/10/23 20:04:56 rillig Exp $ */
+/* $NetBSD: nonints.h,v 1.147 2020/10/30 20:30:44 rillig Exp $ */
/*-
* Copyright (c) 1988, 1989, 1990, 1993
@@ -291,7 +291,7 @@ void Var_Set(const char *, const char *,
void Var_Set_with_flags(const char *, const char *, GNode *, VarSet_Flags);
void Var_Append(const char *, const char *, GNode *);
Boolean Var_Exists(const char *, GNode *);
-const char *Var_Value(const char *, GNode *, char **);
+const char *Var_Value(const char *, GNode *, void **);
VarParseResult Var_Parse(const char **, GNode *, VarEvalFlags,
const char **, void **);
VarParseResult Var_Subst(const char *, GNode *, VarEvalFlags, char **);
Index: src/usr.bin/make/parse.c
diff -u src/usr.bin/make/parse.c:1.412 src/usr.bin/make/parse.c:1.413
--- src/usr.bin/make/parse.c:1.412 Fri Oct 30 15:39:17 2020
+++ src/usr.bin/make/parse.c Fri Oct 30 20:30:44 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.412 2020/10/30 15:39:17 rillig Exp $ */
+/* $NetBSD: parse.c,v 1.413 2020/10/30 20:30:44 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.412 2020/10/30 15:39:17 rillig Exp $");
+MAKE_RCSID("$NetBSD: parse.c,v 1.413 2020/10/30 20:30:44 rillig Exp $");
/* types and constants */
@@ -610,7 +610,7 @@ PrintLocation(FILE *f, const char *filen
{
char dirbuf[MAXPATHLEN+1];
const char *dir, *base;
- char *dir_freeIt, *base_freeIt;
+ void *dir_freeIt, *base_freeIt;
if (*filename == '/' || strcmp(filename, "(stdin)") == 0) {
(void)fprintf(f, "\"%s\" line %zu: ", filename, lineno);
@@ -2346,7 +2346,7 @@ ParseSetParseFile(const char *filename)
static void
ParseTrackInput(const char *name)
{
- char *fp = NULL;
+ void *fp = NULL;
const char *old = Var_Value(MAKE_MAKEFILES, VAR_GLOBAL, &fp);
if (old) {
Index: src/usr.bin/make/suff.c
diff -u src/usr.bin/make/suff.c:1.228 src/usr.bin/make/suff.c:1.229
--- src/usr.bin/make/suff.c:1.228 Fri Oct 30 15:39:17 2020
+++ src/usr.bin/make/suff.c Fri Oct 30 20:30:44 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: suff.c,v 1.228 2020/10/30 15:39:17 rillig Exp $ */
+/* $NetBSD: suff.c,v 1.229 2020/10/30 20:30:44 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -129,7 +129,7 @@
#include "dir.h"
/* "@(#)suff.c 8.4 (Berkeley) 3/21/94" */
-MAKE_RCSID("$NetBSD: suff.c,v 1.228 2020/10/30 15:39:17 rillig Exp $");
+MAKE_RCSID("$NetBSD: suff.c,v 1.229 2020/10/30 20:30:44 rillig Exp $");
#define SUFF_DEBUG0(text) DEBUG0(SUFF, text)
#define SUFF_DEBUG1(fmt, arg1) DEBUG1(SUFF, fmt, arg1)
@@ -1493,7 +1493,7 @@ SuffFindArchiveDeps(GNode *gn, SrcList *
* Copy in the variables from the member node to this one.
*/
{
- char *freeIt;
+ void *freeIt;
Var_Set(PREFIX, Var_Value(PREFIX, mem, &freeIt), gn);
bmake_free(freeIt);
Var_Set(TARGET, Var_Value(TARGET, mem, &freeIt), gn);
Index: src/usr.bin/make/trace.c
diff -u src/usr.bin/make/trace.c:1.19 src/usr.bin/make/trace.c:1.20
--- src/usr.bin/make/trace.c:1.19 Mon Oct 5 19:27:47 2020
+++ src/usr.bin/make/trace.c Fri Oct 30 20:30:44 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: trace.c,v 1.19 2020/10/05 19:27:47 rillig Exp $ */
+/* $NetBSD: trace.c,v 1.20 2020/10/30 20:30:44 rillig Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -48,7 +48,7 @@
#include "job.h"
#include "trace.h"
-MAKE_RCSID("$NetBSD: trace.c,v 1.19 2020/10/05 19:27:47 rillig Exp $");
+MAKE_RCSID("$NetBSD: trace.c,v 1.20 2020/10/30 20:30:44 rillig Exp $");
static FILE *trfile;
static pid_t trpid;
@@ -67,7 +67,7 @@ void
Trace_Init(const char *pathname)
{
if (pathname != NULL) {
- char *dontFreeIt;
+ void *dontFreeIt;
trpid = getpid();
trwd = Var_Value(".CURDIR", VAR_GLOBAL, &dontFreeIt);
Index: src/usr.bin/make/var.c
diff -u src/usr.bin/make/var.c:1.605 src/usr.bin/make/var.c:1.606
--- src/usr.bin/make/var.c:1.605 Fri Oct 30 17:10:48 2020
+++ src/usr.bin/make/var.c Fri Oct 30 20:30:44 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.605 2020/10/30 17:10:48 rillig Exp $ */
+/* $NetBSD: var.c,v 1.606 2020/10/30 20:30:44 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -129,7 +129,7 @@
#include "metachar.h"
/* "@(#)var.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.605 2020/10/30 17:10:48 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.606 2020/10/30 20:30:44 rillig Exp $");
#define VAR_DEBUG1(fmt, arg1) DEBUG1(VAR, fmt, arg1)
#define VAR_DEBUG2(fmt, arg1, arg2) DEBUG2(VAR, fmt, arg1, arg2)
@@ -1015,7 +1015,7 @@ Var_Exists(const char *name, GNode *ctxt
*-----------------------------------------------------------------------
*/
const char *
-Var_Value(const char *name, GNode *ctxt, char **freeIt)
+Var_Value(const char *name, GNode *ctxt, void **freeIt)
{
Var *v = VarFind(name, ctxt, TRUE);
char *p;
