[src/trunk]: src/usr.bin/make simplify

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

details:   https://anonhg.NetBSD.org/src/rev/018ad46c9421
branches:  trunk
changeset: 824768:018ad46c9421
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Jun 17 16:34:07 2017 +0000

description:
simplify

diffstat:

 usr.bin/make/main.c |  15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)

diffs (45 lines):

diff -r 5f756be8247f -r 018ad46c9421 usr.bin/make/main.c
--- a/usr.bin/make/main.c       Sat Jun 17 16:11:14 2017 +0000
+++ b/usr.bin/make/main.c       Sat Jun 17 16:34:07 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: main.c,v 1.267 2017/06/17 15:49:56 christos Exp $      */
+/*     $NetBSD: main.c,v 1.268 2017/06/17 16:34:07 christos Exp $      */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,7 +69,7 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: main.c,v 1.267 2017/06/17 15:49:56 christos Exp $";
+static char rcsid[] = "$NetBSD: main.c,v 1.268 2017/06/17 16:34:07 christos Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
@@ -81,7 +81,7 @@
 #if 0
 static char sccsid[] = "@(#)main.c     8.3 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: main.c,v 1.267 2017/06/17 15:49:56 christos Exp $");
+__RCSID("$NetBSD: main.c,v 1.268 2017/06/17 16:34:07 christos Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -876,13 +876,12 @@
                        value = p1 = Var_Subst(NULL, tmp, VAR_GLOBAL,
                            VARF_WANTRES);
                } else {
-                       char *next = var;
-                       value = Var_Value(next, VAR_GLOBAL, &p1);
+                       value = Var_Value(var, VAR_GLOBAL, &p1);
                        if (*value == '$') {
-                               var = value;
-                               value = p1 = Var_Subst(NULL, var,
+                               value = Var_Subst(NULL, value,
                                    VAR_GLOBAL, VARF_WANTRES);
-                               free(var);
+                               free(p1);
+                               p1 = value;
                        }
                }
                printf("%s\n", value ? value : "");