expr: don't allow "none" in LookupModIndex
authorRan Benita <ran234@gmail.com>
Thu, 4 Oct 2012 10:27:06 +0000 (12:27 +0200)
committerRan Benita <ran234@gmail.com>
Sat, 6 Oct 2012 19:41:58 +0000 (21:41 +0200)
LookupModMask handles this before calling LookupModIndex, and the only
other user in symbols.c doesn't handle this return value at all.

Signed-off-by: Ran Benita <ran234@gmail.com>
src/xkbcomp/expr.c

index a7c91b8..cf6ff40 100644 (file)
@@ -86,12 +86,6 @@ LookupModIndex(struct xkb_context *ctx, const void *priv, xkb_atom_t field,
                enum expr_value_type type, xkb_mod_index_t *val_rtrn)
 {
     const char *name = xkb_atom_text(ctx, field);
-
-    if (istreq(name, "none")) {
-        *val_rtrn = XKB_MOD_INVALID;
-        return true;
-    }
-
     *val_rtrn = ModNameToIndex(name);
     return (*val_rtrn != XKB_MOD_INVALID);
 }