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

Remove priv arguments from ExprResolveKeySym 

They've never been used by its one caller.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
master
Daniel Stone 2012-02-20 14:10:41 +00:00
parent 70033b132b
commit b7b49eb0f7
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/xkbcomp/expr.c
View File

@ -962,8 +962,7 @@ ExprResolveMask(ExprDef * expr,
int
ExprResolveKeySym(ExprDef * expr,
ExprResult * val_rtrn,
IdentLookupFunc lookup, char * lookupPriv)
ExprResult * val_rtrn)
{
int ok = 0;
uint32_t sym;
@ -978,7 +977,7 @@ ExprResolveKeySym(ExprDef * expr,
return True;
}
}
ok = ExprResolveInteger(expr, val_rtrn, lookup, lookupPriv);
ok = ExprResolveInteger(expr, val_rtrn, NULL, NULL);
if ((ok) && (val_rtrn->uval < 10))
val_rtrn->uval += '0';
return ok;

4
src/xkbcomp/expr.h
View File

@ -142,9 +142,7 @@ extern int ExprResolveMask(ExprDef * /* expr */ ,
);
extern int ExprResolveKeySym(ExprDef * /* expr */ ,
ExprResult * /* val_rtrn */ ,
IdentLookupFunc /* lookup */ ,
char * /* lookupPriv */
ExprResult * /* val_rtrn */
);
#endif /* EXPR_H */

2
src/xkbcomp/symbols.c
View File

@ -1641,7 +1641,7 @@ HandleModMapDef(ModMapDef * def,
tmp.haveSymbol = False;
tmp.u.keyName = KeyNameToLong(key->value.keyName);
}
else if (ExprResolveKeySym(key, &rtrn, NULL, NULL))
else if (ExprResolveKeySym(key, &rtrn))
{
tmp.haveSymbol = True;
tmp.u.keySym = rtrn.uval;