[src/trunk]: src/usr.bin/make make: clean up ParseVarnameShort

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

details:   https://anonhg.NetBSD.org/src/rev/6687065d41f5
branches:  trunk
changeset: 952682:6687065d41f5
user:      rillig <rillig%NetBSD.org@localhost>
date:      Sun Feb 14 18:55:51 2021 +0000

description:
make: clean up ParseVarnameShort

Single-character short variable expressions such as $V neither have a
starting character nor an ending character.  The only interesting
character forms the complete variable name.

No functional change.

diffstat:

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

diffs (65 lines):

diff -r 1a5fb9078ae9 -r 6687065d41f5 usr.bin/make/var.c
--- a/usr.bin/make/var.c        Sun Feb 14 18:45:44 2021 +0000
+++ b/usr.bin/make/var.c        Sun Feb 14 18:55:51 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: var.c,v 1.816 2021/02/14 18:21:31 rillig Exp $ */
+/*     $NetBSD: var.c,v 1.817 2021/02/14 18:55:51 rillig Exp $ */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -139,7 +139,7 @@
 #include "metachar.h"
 
 /*     "@(#)var.c      8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.816 2021/02/14 18:21:31 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.817 2021/02/14 18:55:51 rillig Exp $");
 
 typedef enum VarFlags {
        VAR_NONE        = 0,
@@ -3921,11 +3921,11 @@
 }
 
 /*
- * Parse a single-character variable name such as $V or $@.
+ * Parse a single-character variable name such as in $V or $@.
  * Return whether to continue parsing.
  */
 static Boolean
-ParseVarnameShort(char startc, const char **pp, GNode *scope,
+ParseVarnameShort(char varname, const char **pp, GNode *scope,
                  VarEvalFlags eflags,
                  VarParseResult *out_FALSE_res, const char **out_FALSE_val,
                  Var **out_TRUE_var)
@@ -3934,28 +3934,22 @@
        Var *v;
        VarParseResult vpr;
 
-       /*
-        * If it's not bounded by braces of some sort, life is much simpler.
-        * We just need to check for the first character and return the
-        * value if it exists.
-        */
-
-       vpr = ValidShortVarname(startc, *pp);
+       vpr = ValidShortVarname(varname, *pp);
        if (vpr != VPR_OK) {
                (*pp)++;
+               *out_FALSE_res = vpr;
                *out_FALSE_val = var_Error;
-               *out_FALSE_res = vpr;
                return FALSE;
        }
 
-       name[0] = startc;
+       name[0] = varname;
        name[1] = '\0';
        v = VarFind(name, scope, TRUE);
        if (v == NULL) {
                const char *val;
                *pp += 2;
 
-               val = UndefinedShortVarValue(startc, scope);
+               val = UndefinedShortVarValue(varname, scope);
                if (val == NULL)
                        val = eflags & VARE_UNDEFERR ? var_Error : varUndefined;