[src/trunk]: src/usr.bin/make make(1): inline local variable in Cond_Eval

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

details:   https://anonhg.NetBSD.org/src/rev/84f7c088d012
branches:  trunk
changeset: 943851:84f7c088d012
user:      rillig <rillig%NetBSD.org@localhost>
date:      Sat Sep 12 10:41:43 2020 +0000

description:
make(1): inline local variable in Cond_Eval

diffstat:

 usr.bin/make/cond.c |  14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)

diffs (64 lines):

diff -r d58f19e10e6e -r 84f7c088d012 usr.bin/make/cond.c
--- a/usr.bin/make/cond.c       Sat Sep 12 10:38:52 2020 +0000
+++ b/usr.bin/make/cond.c       Sat Sep 12 10:41:43 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cond.c,v 1.135 2020/09/12 10:38:52 rillig Exp $        */
+/*     $NetBSD: cond.c,v 1.136 2020/09/12 10:41:43 rillig Exp $        */
 
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -70,14 +70,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: cond.c,v 1.135 2020/09/12 10:38:52 rillig Exp $";
+static char rcsid[] = "$NetBSD: cond.c,v 1.136 2020/09/12 10:41:43 rillig Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)cond.c     8.2 (Berkeley) 1/2/94";
 #else
-__RCSID("$NetBSD: cond.c,v 1.135 2020/09/12 10:38:52 rillig Exp $");
+__RCSID("$NetBSD: cond.c,v 1.136 2020/09/12 10:41:43 rillig Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -1084,10 +1084,8 @@
     const struct If *ifp;
     Boolean isElif;
     Boolean value;
-    int level;                 /* Level at which to report errors. */
     enum if_states state;
 
-    level = PARSE_FATAL;
     if (!cond_state) {
        cond_state = bmake_malloc(max_if_depth * sizeof(*cond_state));
        cond_state[0] = IF_ACTIVE;
@@ -1103,7 +1101,7 @@
                return COND_INVALID;
            /* End of conditional section */
            if (cond_depth == cond_min_depth) {
-               Parse_Error(level, "if-less endif");
+               Parse_Error(PARSE_FATAL, "if-less endif");
                return COND_PARSE;
            }
            /* Return state for previous conditional */
@@ -1117,7 +1115,7 @@
        if (is_token(line, "se", 2)) {
            /* It is else... */
            if (cond_depth == cond_min_depth) {
-               Parse_Error(level, "if-less else");
+               Parse_Error(PARSE_FATAL, "if-less else");
                return COND_PARSE;
            }
 
@@ -1166,7 +1164,7 @@
 
     if (isElif) {
        if (cond_depth == cond_min_depth) {
-           Parse_Error(level, "if-less elif");
+           Parse_Error(PARSE_FATAL, "if-less elif");
            return COND_PARSE;
        }
        state = cond_state[cond_depth];