From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Wed, 4 Jan 2023 04:13:11 +0000 (-0800)
Subject: expr scan: remove shadowing of 'expr' global
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=996254e109c134b0c7c6e6be9751b8a1d648e006;p=graphviz

expr scan: remove shadowing of 'expr' global
---

diff --git a/lib/expr/exeval.c b/lib/expr/exeval.c
index ce6e1cc5a..3a02f8e44 100644
--- a/lib/expr/exeval.c
+++ b/lib/expr/exeval.c
@@ -498,9 +498,7 @@ scformat(void* vp, Sffmt_t* dp)
  * do scanf
  */
 
-static int
-scan(Expr_t* ex, Exnode_t* expr, void* env, Sfio_t* sp)
-{
+static int scan(Expr_t *ex, Exnode_t *exnode, void *env, Sfio_t *sp) {
 	Extype_t		v;
 	Extype_t		u;
 	Fmt_t			fmt;
@@ -508,10 +506,10 @@ scan(Expr_t* ex, Exnode_t* expr, void* env, Sfio_t* sp)
 
 	if (!sp)
 	{
-		if (expr->data.scan.descriptor)
+		if (exnode->data.scan.descriptor)
 		{
-			v = eval(ex, expr->data.scan.descriptor, env);
-			if (expr->data.scan.descriptor->type == STRING)
+			v = eval(ex, exnode->data.scan.descriptor, env);
+			if (exnode->data.scan.descriptor->type == STRING)
 				goto get;
 		}
 		else
@@ -527,9 +525,9 @@ scan(Expr_t* ex, Exnode_t* expr, void* env, Sfio_t* sp)
 	fmt.fmt.extf = scformat;
 	fmt.expr = ex;
 	fmt.env = env;
-	u = eval(ex, expr->data.scan.format, env);
+	u = eval(ex, exnode->data.scan.format, env);
 	fmt.fmt.form = u.string;
-	fmt.actuals = expr->data.scan.args;
+	fmt.actuals = exnode->data.scan.args;
 	n = sp ? sfscanf(sp, "%!", &fmt) : sfsscanf(v.string, "%!", &fmt);
 	if (fmt.actuals && !*fmt.fmt.form)
 		exerror("scanf: %s: too many arguments", fmt.actuals->data.operand.left->data.variable.symbol->name);