Commit 3151ce36fa154a4b750fdbf5c0d6ede289ee5692
2012-02-20T13:34:36
Remove priv arguments from ExprResolveModMask What with them now being unused and all. Signed-off-by: Daniel Stone <daniel@fooishbar.org>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72
diff --git a/src/xkbcomp/compat.c b/src/xkbcomp/compat.c
index 26117a1..155d267 100644
--- a/src/xkbcomp/compat.c
+++ b/src/xkbcomp/compat.c
@@ -337,7 +337,7 @@ ResolveStateAndPredicate(ExprDef * expr,
}
}
- if (ExprResolveModMask(expr, &result, NULL, NULL))
+ if (ExprResolveModMask(expr, &result))
{
*mods_rtrn = result.uval;
return True;
diff --git a/src/xkbcomp/expr.c b/src/xkbcomp/expr.c
index 2416bd2..db1406c 100644
--- a/src/xkbcomp/expr.c
+++ b/src/xkbcomp/expr.c
@@ -266,14 +266,13 @@ LookupModMask(char * priv,
int
ExprResolveModMask(ExprDef * expr,
- ExprResult * val_rtrn,
- IdentLookupFunc lookup, char * lookupPriv)
+ ExprResult * val_rtrn)
{
LookupPriv priv;
priv.priv = NULL;
- priv.chain = lookup;
- priv.chainPriv = lookupPriv;
+ priv.chain = NULL;
+ priv.chainPriv = NULL;
return ExprResolveMask(expr, val_rtrn, LookupModMask, (char *) & priv);
}
diff --git a/src/xkbcomp/expr.h b/src/xkbcomp/expr.h
index 538770c..230b85b 100644
--- a/src/xkbcomp/expr.h
+++ b/src/xkbcomp/expr.h
@@ -94,9 +94,7 @@ extern int LookupModIndex(char * /* priv */ ,
);
extern int ExprResolveModMask(ExprDef * /* expr */ ,
- ExprResult * /* val_rtrn */ ,
- IdentLookupFunc /* lookup */ ,
- char * /* priv */
+ ExprResult * /* val_rtrn */
);
extern int ExprResolveVModMask(ExprDef * /* expr */ ,
diff --git a/src/xkbcomp/vmod.c b/src/xkbcomp/vmod.c
index 82004e6..d7f92a5 100644
--- a/src/xkbcomp/vmod.c
+++ b/src/xkbcomp/vmod.c
@@ -102,7 +102,7 @@ HandleVModDef(VModDef * stmt, struct xkb_desc *xkb, unsigned mergeMode,
{
const char *str1;
const char *str2 = "";
- if (!ExprResolveModMask(stmt->value, &mod, NULL, NULL))
+ if (!ExprResolveModMask(stmt->value, &mod))
{
str1 = XkbcAtomText(stmt->name);
ACTION("Declaration of %s ignored\n", str1);
@@ -141,7 +141,7 @@ HandleVModDef(VModDef * stmt, struct xkb_desc *xkb, unsigned mergeMode,
names->vmods[nextFree] = stmt->name;
if (stmt->value == NULL)
return True;
- if (ExprResolveModMask(stmt->value, &mod, NULL, NULL))
+ if (ExprResolveModMask(stmt->value, &mod))
{
srv->vmods[nextFree] = mod.uval;
return True;