StreetLight
/
libxkbcommon
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove priv arguments from ExprResolveModMask 

What with them now being unused and all.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
master
Daniel Stone 2012-02-20 13:34:36 +00:00
parent 67605d2c90
commit 3151ce36fa
4 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/xkbcomp/compat.c
View File

@ -337,7 +337,7 @@ ResolveStateAndPredicate(ExprDef * expr,
}
}
if (ExprResolveModMask(expr, &result, NULL, NULL))
if (ExprResolveModMask(expr, &result))
{
*mods_rtrn = result.uval;
return True;

7
src/xkbcomp/expr.c
View File

@ -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);
}

4
src/xkbcomp/expr.h
View File

@ -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 */ ,

4
src/xkbcomp/vmod.c
View File

@ -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;