Sun Jul 19 15:51:51 2020 UTC ()

make(1): eliminate unused local variables


(rillig)

diff -r1.263 -r1.264 src/usr.bin/make/var.c

--- src/usr.bin/make/var.c 2020/07/19 15:47:10	1.263
+++ src/usr.bin/make/var.c 2020/07/19 15:51:51	1.264

 @@ -1,14 +1,14 @@
-/*	$NetBSD: var.c,v 1.263 2020/07/19 15:47:10 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.264 2020/07/19 15:51:51 rillig Exp $	*/
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -59,34 +59,34 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: var.c,v 1.263 2020/07/19 15:47:10 rillig Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.264 2020/07/19 15:51:51 rillig Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)var.c	8.3 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: var.c,v 1.263 2020/07/19 15:47:10 rillig Exp $");
+__RCSID("$NetBSD: var.c,v 1.264 2020/07/19 15:51:51 rillig Exp $");
 #endif
 #endif /* not lint */
 #endif
 /*-
  * var.c --
  *	Variable-handling functions
+ *
  * Interface:
  *	Var_Set		    Set the value of a variable in the given
  *			    context. The variable is created if it doesn't
  *			    yet exist. The value and variable name need not
  *			    be preserved.
 @@ -3053,39 +3053,37 @@ ApplyModifier_IfElse(ApplyModifiersState
     /* find ':', and then substitute accordingly */
     if (st->flags & VARE_WANTRES) {
 	cond_rc = Cond_EvalExpression(NULL, st->v->name, &value, 0, FALSE);
 	then_flags = cond_rc != COND_INVALID && value ? 0 : VAR_NOSUBST;
 	else_flags = cond_rc != COND_INVALID && !value ? 0 : VAR_NOSUBST;
     } else {
 	/* we are just consuming and discarding */
 	cond_rc = value = 0;
 	then_flags = else_flags = VAR_NOSUBST;
+    }
     st->cp = ++st->tstr;
     st->delim = ':';
     int then_len;
     char *then_expr = VarGetPattern(
 	st->ctxt, &st->parsestate, st->flags, &st->cp, st->delim,
-	&then_flags, &then_len, NULL);
+	&then_flags, NULL, NULL);
     if (then_expr == NULL)
 	return FALSE;
     /* BROPEN or PROPEN */
     st->delim = st->endc;
     int else_len;
     char *else_expr = VarGetPattern(
 	st->ctxt, &st->parsestate, st->flags, &st->cp, st->delim,
-	&else_flags, &else_len, NULL);
+	&else_flags, NULL, NULL);
     if (else_expr == NULL)
 	return FALSE;
     st->termc = *--st->cp;
     st->delim = '\0';
     if (cond_rc == COND_INVALID) {
 	Error("Bad conditional expression `%s' in %s?%s:%s",
 	    st->v->name, st->v->name, then_expr, else_expr);
 	return FALSE;
+    }
     if (value) {
 	st->newStr = then_expr;