Module Name: src
Committed By: rillig
Date: Sat Nov 7 21:31:08 UTC 2020
Modified Files:
src/usr.bin/make: nonints.h var.c
Log Message:
make(1): fix type mismatch between int and VarSetFlags
To generate a diff of this commit:
cvs rdiff -u -r1.155 -r1.156 src/usr.bin/make/nonints.h
cvs rdiff -u -r1.673 -r1.674 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/nonints.h
diff -u src/usr.bin/make/nonints.h:1.155 src/usr.bin/make/nonints.h:1.156
--- src/usr.bin/make/nonints.h:1.155 Sat Nov 7 13:13:19 2020
+++ src/usr.bin/make/nonints.h Sat Nov 7 21:31:07 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: nonints.h,v 1.155 2020/11/07 13:13:19 rillig Exp $ */
+/* $NetBSD: nonints.h,v 1.156 2020/11/07 21:31:07 rillig Exp $ */
/*-
* Copyright (c) 1988, 1989, 1990, 1993
@@ -227,9 +227,11 @@ typedef enum VarEvalFlags {
VARE_ASSIGN = 1 << 2
} VarEvalFlags;
-typedef enum VarSet_Flags {
+typedef enum VarSetFlags {
+ VAR_SET_NONE = 0,
+
/* do not export */
- VAR_NO_EXPORT = 1 << 0,
+ VAR_SET_NO_EXPORT = 1 << 0,
/* Make the variable read-only. No further modification is possible,
* except for another call to Var_Set with the same flag. */
Index: src/usr.bin/make/var.c
diff -u src/usr.bin/make/var.c:1.673 src/usr.bin/make/var.c:1.674
--- src/usr.bin/make/var.c:1.673 Sat Nov 7 14:11:58 2020
+++ src/usr.bin/make/var.c Sat Nov 7 21:31:07 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.673 2020/11/07 14:11:58 rillig Exp $ */
+/* $NetBSD: var.c,v 1.674 2020/11/07 21:31:07 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -130,7 +130,7 @@
#include "metachar.h"
/* "@(#)var.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.673 2020/11/07 14:11:58 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.674 2020/11/07 21:31:07 rillig Exp $");
#define VAR_DEBUG1(fmt, arg1) DEBUG1(VAR, fmt, arg1)
#define VAR_DEBUG2(fmt, arg1, arg2) DEBUG2(VAR, fmt, arg1, arg2)
@@ -808,7 +808,7 @@ Var_SetWithFlags(const char *name, const
*/
v = VarFind(name, ctxt, FALSE);
if (v == NULL) {
- if (ctxt == VAR_CMDLINE && !(flags & VAR_NO_EXPORT)) {
+ if (ctxt == VAR_CMDLINE && !(flags & VAR_SET_NO_EXPORT)) {
/*
* This var would normally prevent the same name being added
* to VAR_GLOBAL, so delete it from there if needed.
@@ -837,7 +837,7 @@ Var_SetWithFlags(const char *name, const
* to the environment (as per POSIX standard)
* Other than internals.
*/
- if (ctxt == VAR_CMDLINE && !(flags & VAR_NO_EXPORT) && name[0] != '.') {
+ if (ctxt == VAR_CMDLINE && !(flags & VAR_SET_NO_EXPORT) && name[0] != '.') {
if (v == NULL)
v = VarFind(name, ctxt, FALSE); /* we just added it */
v->flags |= VAR_FROM_CMD;
@@ -889,7 +889,7 @@ out:
void
Var_Set(const char *name, const char *val, GNode *ctxt)
{
- Var_SetWithFlags(name, val, ctxt, 0);
+ Var_SetWithFlags(name, val, ctxt, VAR_SET_NONE);
}
/*-
@@ -1457,7 +1457,7 @@ ModifyWord_Loop(const char *word, SepBuf
return;
args = data;
- Var_SetWithFlags(args->tvar, word, args->ctx, VAR_NO_EXPORT);
+ Var_SetWithFlags(args->tvar, word, args->ctx, VAR_SET_NO_EXPORT);
(void)Var_Subst(args->str, args->ctx, args->eflags, &s);
/* TODO: handle errors */
