Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.bin/make make(1): rename VAR_EXPORTED_YES to VAR_EXPORTE...



details:   https://anonhg.NetBSD.org/src/rev/2095f68d4978
branches:  trunk
changeset: 956431:2095f68d4978
user:      rillig <rillig%NetBSD.org@localhost>
date:      Fri Oct 30 16:45:37 2020 +0000

description:
make(1): rename VAR_EXPORTED_YES to VAR_EXPORTED_SOME

The "yes" sounded too much like "all".

diffstat:

 usr.bin/make/var.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (38 lines):

diff -r 024837bcc59c -r 2095f68d4978 usr.bin/make/var.c
--- a/usr.bin/make/var.c        Fri Oct 30 16:29:49 2020 +0000
+++ b/usr.bin/make/var.c        Fri Oct 30 16:45:37 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: var.c,v 1.601 2020/10/30 16:16:16 rillig Exp $ */
+/*     $NetBSD: var.c,v 1.602 2020/10/30 16:45:37 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.601 2020/10/30 16:16:16 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.602 2020/10/30 16:45:37 rillig Exp $");
 
 #define VAR_DEBUG1(fmt, arg1) DEBUG1(VAR, fmt, arg1)
 #define VAR_DEBUG2(fmt, arg1, arg2) DEBUG2(VAR, fmt, arg1, arg2)
@@ -258,7 +258,7 @@
  */
 typedef enum VarExportedMode {
     VAR_EXPORTED_NONE,
-    VAR_EXPORTED_YES,
+    VAR_EXPORTED_SOME,
     VAR_EXPORTED_ALL
 } VarExportedMode;
 
@@ -664,8 +664,8 @@
        for (i = 0; i < words.len; i++) {
            const char *name = words.words[i];
            if (Var_Export1(name, flags)) {
-               if (var_exportedVars != VAR_EXPORTED_ALL)
-                   var_exportedVars = VAR_EXPORTED_YES;
+               if (var_exportedVars == VAR_EXPORTED_NONE)
+                   var_exportedVars = VAR_EXPORTED_SOME;
                if (isExport && (flags & VAR_EXPORT_PARENT)) {
                    Var_Append(MAKE_EXPORTED, name, VAR_GLOBAL);
                }



Home | Main Index | Thread Index | Old Index