From: Matthew Fernandez Date: Wed, 4 Jan 2023 04:22:56 +0000 (-0800) Subject: expr extokens: remove shadowing of 'expr' global X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e45813fc45ee66467b530a3e43dcedb17987d319;p=graphviz expr extokens: remove shadowing of 'expr' global --- diff --git a/lib/expr/exeval.c b/lib/expr/exeval.c index 8795b5e81..cf5721766 100644 --- a/lib/expr/exeval.c +++ b/lib/expr/exeval.c @@ -897,19 +897,17 @@ static Extype_t exsplit(Expr_t *ex, Exnode_t *exnode, void *env) { * tokenize string and store in array * return number of tokens */ -static Extype_t -extokens(Expr_t * ex, Exnode_t * expr, void *env) -{ +static Extype_t extokens(Expr_t *ex, Exnode_t *exnode, void *env) { Extype_t v; char *str; char *seps; char *tok; size_t sz; - Dt_t* arr = (Dt_t*)expr->data.split.array->local.pointer; + Dt_t* arr = (Dt_t*)exnode->data.split.array->local.pointer; - str = eval(ex, expr->data.split.string, env).string; - if (expr->data.split.seps) - seps = eval(ex, expr->data.split.seps, env).string; + str = eval(ex, exnode->data.split.string, env).string; + if (exnode->data.split.seps) + seps = eval(ex, exnode->data.split.seps, env).string; else seps = " \t\n";