Commit 4bb8b6b1cf028b8414a8657aa7e6165af83d6d9a

Daniel Stone 2012-08-03T05:19:50

Remove unused vmodmask calculation This was basically an open-coded VModsToReal, which we were using in the line immediately below. Signed-off-by: Daniel Stone <daniel@fooishbar.org>

diff --git a/src/xkbcomp/compat.c b/src/xkbcomp/compat.c
index 9007180..b877b91 100644
--- a/src/xkbcomp/compat.c
+++ b/src/xkbcomp/compat.c
@@ -1500,18 +1500,10 @@ UpdateModifiersFromCompat(struct xkb_keymap *keymap)
 
     /* Now update the level masks for all the types to reflect the vmods. */
     for (i = 0; i < keymap->num_types; i++) {
-        xkb_mod_mask_t mask = 0;
         type = &keymap->types[i];
         type->mods.mask = type->mods.real_mods;
         type->mods.mask |= VModsToReal(keymap, type->mods.vmods);
 
-        /* FIXME: We compute the mask with doing anything with it? */
-        for (vmod = 0; vmod < XkbNumVirtualMods; vmod++) {
-            if (!(type->mods.vmods & (1 << vmod)))
-                continue;
-            mask |= keymap->vmods[vmod];
-        }
-
         for (j = 0; j < type->num_entries; j++) {
             type->map[j].mods.mask = 0;
             type->map[j].mods.mask |= type->map[j].mods.real_mods;