From b94017294f4b0abc2ccc754e24fa89dbc48cdcb6 Mon Sep 17 00:00:00 2001 From: Matthew Fernandez Date: Sat, 9 Oct 2021 12:14:53 -0700 Subject: [PATCH] print: remove variable shadowing of 'expr' global --- lib/expr/exeval.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/lib/expr/exeval.c b/lib/expr/exeval.c index 5e6608077..db92dd1b6 100644 --- a/lib/expr/exeval.c +++ b/lib/expr/exeval.c @@ -384,17 +384,14 @@ static int prints(Expr_t *ex, Exnode_t *exnode, void *env, Sfio_t *sp) { /* * do printf */ - -static int -print(Expr_t* ex, Exnode_t* expr, void* env, Sfio_t* sp) -{ +static int print(Expr_t *ex, Exnode_t *exnode, void *env, Sfio_t *sp) { Print_t* x; Extype_t v; Fmt_t fmt; if (!sp) { - v = eval(ex, expr->data.print.descriptor, env); + v = eval(ex, exnode->data.print.descriptor, env); if (v.integer < 0 || v.integer >= elementsof(ex->file) || (!(sp = ex->file[v.integer]) && !(sp = ex->file[v.integer] = sfnew(NULL, NULL, SF_UNBOUND, v.integer, SF_READ|SF_WRITE)))) { exerror("printf: %" PRIdMAX ": invalid descriptor", (intmax_t)v.integer); @@ -405,7 +402,7 @@ print(Expr_t* ex, Exnode_t* expr, void* env, Sfio_t* sp) fmt.fmt.extf = prformat; fmt.expr = ex; fmt.env = env; - x = expr->data.print.args; + x = exnode->data.print.args; if (x->format) do { -- 2.40.0