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

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

diff --git a/lib/expr/exeval.c b/lib/expr/exeval.c
index cf5721766..0b1336d05 100644
--- a/lib/expr/exeval.c
+++ b/lib/expr/exeval.c
@@ -938,9 +938,7 @@ static Extype_t extokens(Expr_t *ex, Exnode_t *exnode, void *env) {
 /* exsub:
  * return string after pattern substitution
  */
-static Extype_t
-exsub(Expr_t * ex, Exnode_t * expr, void *env, bool global)
-{
+static Extype_t exsub(Expr_t *ex, Exnode_t *exnode, void *env, bool global) {
 	char *str;
 	char *pat;
 	char *repl;
@@ -951,10 +949,10 @@ exsub(Expr_t * ex, Exnode_t * expr, void *env, bool global)
 	int flags = STR_MAXIMAL;
 	int ng;
 
-	str = eval(ex, expr->data.string.base, env).string;
-	pat = eval(ex, expr->data.string.pat, env).string;
-	if (expr->data.string.repl)
-		repl = eval(ex, expr->data.string.repl, env).string;
+	str = eval(ex, exnode->data.string.base, env).string;
+	pat = eval(ex, exnode->data.string.pat, env).string;
+	if (exnode->data.string.repl)
+		repl = eval(ex, exnode->data.string.repl, env).string;
 	else
 		repl = 0;