From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Fri, 5 Aug 2022 04:43:03 +0000 (-0700)
Subject: expr: remove unused parameters from 'Exdisc_t.matchf'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=refs%2Fheads%2Fsmattr%2F03db530d-2fe9-47e3-b566-bda45c2928ce;p=graphviz

expr: remove unused parameters from 'Exdisc_t.matchf'

I guess when I committed 260f650085eb25b5b68c81a5960232d025fb6942 it was not
obvious to me that this is entirely part of private internal interfaces and the
callback signature involved is not exposed publicly.
---

diff --git a/lib/expr/exeval.c b/lib/expr/exeval.c
index 4ec732878..5d0590c9d 100644
--- a/lib/expr/exeval.c
+++ b/lib/expr/exeval.c
@@ -1297,8 +1297,7 @@ eval(Expr_t* ex, Exnode_t* expr, void* env)
 						continue;
 					case STRING:
 						if ((ex->disc->version >= 19981111L && ex->disc->matchf)
-						      ? ex->disc->matchf(ex, x, (*t)->string, expr->data.operand.left,
-						                         v.string, env, ex->disc)
+						      ? ex->disc->matchf((*t)->string, v.string)
 						      : strmatch((*t)->string, v.string))
 							break;
 						continue;
@@ -1974,9 +1973,7 @@ eval(Expr_t* ex, Exnode_t* expr, void* env)
 		case NE:
 			v.integer = ((v.string && r.string)
 			              ? ((ex->disc->version >= 19981111L && ex->disc->matchf)
-			                ? ex->disc->matchf(ex, expr->data.operand.left, v.string,
-			                                   expr->data.operand.right, r.string, env,
-			                                   ex->disc)
+			                ? ex->disc->matchf(v.string, r.string)
 			                : strmatch(v.string, r.string))
 			              : (v.string == r.string)) == (expr->op == EQ);
 			return v;
diff --git a/lib/expr/expr.h b/lib/expr/expr.h
index 0cfe15d5b..ddadb0a8f 100644
--- a/lib/expr/expr.h
+++ b/lib/expr/expr.h
@@ -219,7 +219,7 @@ struct Exdisc_s				/* discipline			*/
 					/* reference value function	*/
 	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*);
+	int		(*matchf)(const char*, const char*);
 	/* exit function           */
 	Exexit_f	exitf;
 	int*		types;
diff --git a/lib/gvpr/compile.c b/lib/gvpr/compile.c
index 1f41dda81..d770b3a0c 100644
--- a/lib/gvpr/compile.c
+++ b/lib/gvpr/compile.c
@@ -2212,16 +2212,7 @@ static Extype_t keyval(Extype_t v, int type) {
 /* matchval:
  * Pattern match strings.
  */
-static int
-matchval(Expr_t * pgm, Exnode_t * xstr, const char *str, Exnode_t * xpat,
-	 const char *pat, void *env, Exdisc_t * disc)
-{
-    (void)pgm;
-    (void)xstr;
-    (void)xpat;
-    (void)env;
-    (void)disc;
-
+static int matchval(const char *str, const char *pat) {
     return strgrpmatch(str, pat, NULL, 0,
 		       STR_MAXIMAL | STR_LEFT | STR_RIGHT);
 }