From 765f2da4a4579d9044675cc2c6fc99232e939d05 Mon Sep 17 00:00:00 2001 From: Matthew Fernandez Date: Thu, 4 Aug 2022 21:35:28 -0700 Subject: [PATCH] expr: remove unused parameters from 'Exdisc_t.setf' I guess when I committed 5b4de3922a2f169c2e773ffe85651898aedd9351 it was not obvious to me that this is entirely part of private internal interfaces and the callback signature involved is not exposed publicly. --- lib/expr/exeval.c | 3 +-- lib/expr/expr.h | 2 +- lib/gvpr/compile.c | 5 +---- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/lib/expr/exeval.c b/lib/expr/exeval.c index 49989ce6e..4ec732878 100644 --- a/lib/expr/exeval.c +++ b/lib/expr/exeval.c @@ -1204,8 +1204,7 @@ eval(Expr_t* ex, Exnode_t* expr, void* env) x->data.variable.dyna->data.variable.dyna->data.constant.value = locv; } if (ex->disc->setf(ex, x, x->data.variable.symbol, - x->data.variable.reference, env, (int)i.integer, v, - ex->disc) < 0) + x->data.variable.reference, env, v) < 0) exerror("%s: cannot set value", x->data.variable.symbol->name); } if (expr->subop == PRE) diff --git a/lib/expr/expr.h b/lib/expr/expr.h index 1b27f1ba0..0cfe15d5b 100644 --- a/lib/expr/expr.h +++ b/lib/expr/expr.h @@ -217,7 +217,7 @@ struct Exdisc_s /* discipline */ /* get value function */ Extype_t (*reff)(Expr_t*, Exnode_t*, Exid_t*, Exref_t*); /* reference value function */ - int (*setf)(Expr_t*, Exnode_t*, Exid_t*, Exref_t*, void*, int, Extype_t, Exdisc_t*); + int (*setf)(Expr_t*, Exnode_t*, Exid_t*, Exref_t*, void*, Extype_t); /* set value function */ int (*matchf)(Expr_t*, Exnode_t*, const char*, Exnode_t*, const char*, void*, Exdisc_t*); /* exit function */ diff --git a/lib/gvpr/compile.c b/lib/gvpr/compile.c index 4b904d0e0..1f41dda81 100644 --- a/lib/gvpr/compile.c +++ b/lib/gvpr/compile.c @@ -1603,11 +1603,8 @@ static char *typeName(int op) { */ static int setval(Expr_t * pgm, Exnode_t * x, Exid_t * sym, Exref_t * ref, - void *env, int elt, Extype_t v, Exdisc_t * disc) + void *env, Extype_t v) { - (void)elt; - (void)disc; - Gpr_t *state; Agobj_t *objp; Agnode_t *np; -- 2.40.0