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

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

diff --git a/lib/expr/excc.c b/lib/expr/excc.c
index 006bdf59d..c12ff1053 100644
--- a/lib/expr/excc.c
+++ b/lib/expr/excc.c
@@ -648,7 +648,7 @@ global(Dt_t* table, void* object, void* handle)
  * open C program generator context
  */
 
-static Excc_t *exccopen(Expr_t *expr, Exccdisc_t *disc) {
+static Excc_t *exccopen(Expr_t *ex, Exccdisc_t *disc) {
 	Excc_t*	cc;
 	char*			id;
 
@@ -656,8 +656,8 @@ static Excc_t *exccopen(Expr_t *expr, Exccdisc_t *disc) {
 		id = "";
 	if (!(cc = newof(0, Excc_t, 1, strlen(id) + 2)))
 		return 0;
-	cc->expr = expr;
-	cc->disc = expr->disc;
+	cc->expr = ex;
+	cc->disc = ex->disc;
 	cc->id = (char*)(cc + 1);
 	cc->ccdisc = disc;
 	if (!(disc->flags & EX_CC_DUMP))
@@ -667,7 +667,7 @@ static Excc_t *exccopen(Expr_t *expr, Exccdisc_t *disc) {
 		if (*id)
 			snprintf(cc->id, strlen(id) + 2, "%s_", id);
 		agxbputc(disc->text, '\n');
-		dtwalk(expr->symbols, global, disc->text);
+		dtwalk(ex->symbols, global, disc->text);
 	}
 	return cc;
 }