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

expr: don't expose LookupModIndex 

The Lookup* functions should remain a private implementation detail of
the expr.c file.

Signed-off-by: Ran Benita <ran234@gmail.com>
master
Ran Benita 2012-10-05 21:40:49 +02:00
parent aed3140e8d
commit 6974e1f9ac
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/xkbcomp/expr.c
View File

@ -81,7 +81,7 @@ SimpleLookup(struct xkb_context *ctx, const void *priv, xkb_atom_t field,
return false; return false;
} }
bool static bool
LookupModIndex(struct xkb_context *ctx, const void *priv, xkb_atom_t field, LookupModIndex(struct xkb_context *ctx, const void *priv, xkb_atom_t field,
enum expr_value_type type, xkb_mod_index_t *val_rtrn) enum expr_value_type type, xkb_mod_index_t *val_rtrn)
{ {

4
src/xkbcomp/expr.h
View File

@ -32,10 +32,6 @@ ExprResolveLhs(struct xkb_context *ctx, const ExprDef *expr,
const char **elem_rtrn, const char **field_rtrn, const char **elem_rtrn, const char **field_rtrn,
ExprDef **index_rtrn); ExprDef **index_rtrn);
bool
LookupModIndex(struct xkb_context *ctx, const void *priv, xkb_atom_t field,
enum expr_value_type type, xkb_mod_index_t *val_rtrn);
bool bool
ExprResolveModMask(struct xkb_context *ctx, const ExprDef *expr, ExprResolveModMask(struct xkb_context *ctx, const ExprDef *expr,
xkb_mod_mask_t *mask_rtrn); xkb_mod_mask_t *mask_rtrn);

3
src/xkbcomp/symbols.c
View File

@ -1209,7 +1209,8 @@ HandleModMapDef(SymbolsInfo *info, ModMapDef *def)
bool ok; bool ok;
struct xkb_context *ctx = info->keymap->ctx; struct xkb_context *ctx = info->keymap->ctx;
if (!LookupModIndex(ctx, NULL, def->modifier, EXPR_TYPE_INT, &ndx)) { ndx = ModNameToIndex(xkb_atom_text(ctx, def->modifier));
if (ndx == XKB_MOD_INVALID) {
log_err(info->keymap->ctx, log_err(info->keymap->ctx,
"Illegal modifier map definition; " "Illegal modifier map definition; "
"Ignoring map for non-modifier \"%s\"\n", "Ignoring map for non-modifier \"%s\"\n",