[src/trunk]: src/usr.bin/make make(1): clean up confusing code in Var_Export

[rillig <rillig%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2025e4214d87
branches:  trunk
changeset: 1014784:2025e4214d87
user:      rillig <rillig%NetBSD.org@localhost>
date:      Sat Oct 03 10:13:39 2020 +0000

description:
make(1): clean up confusing code in Var_Export

The generated code stays exactly the same.

diffstat:

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

diffs (36 lines):

diff -r 0e948269b7d9 -r 2025e4214d87 usr.bin/make/var.c
--- a/usr.bin/make/var.c        Sat Oct 03 10:04:34 2020 +0000
+++ b/usr.bin/make/var.c        Sat Oct 03 10:13:39 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: var.c,v 1.556 2020/10/02 17:42:33 rillig Exp $ */
+/*     $NetBSD: var.c,v 1.557 2020/10/03 10:13:39 rillig Exp $ */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -121,7 +121,7 @@
 #include    "metachar.h"
 
 /*     "@(#)var.c      8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.556 2020/10/02 17:42:33 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.557 2020/10/03 10:13:39 rillig Exp $");
 
 #define VAR_DEBUG1(fmt, arg1) DEBUG1(VAR, fmt, arg1)
 #define VAR_DEBUG2(fmt, arg1, arg2) DEBUG2(VAR, fmt, arg1, arg2)
@@ -601,14 +601,14 @@
        return;
     }
 
-    flags = 0;
     if (strncmp(str, "-env", 4) == 0) {
        str += 4;
+       flags = 0;
     } else if (strncmp(str, "-literal", 8) == 0) {
        str += 8;
-       flags |= VAR_EXPORT_LITERAL;
+       flags = VAR_EXPORT_LITERAL;
     } else {
-       flags |= VAR_EXPORT_PARENT;
+       flags = VAR_EXPORT_PARENT;
     }
 
     (void)Var_Subst(str, VAR_GLOBAL, VARE_WANTRES, &val);