Commit 09dac54b97807dd2667435fdd7243b3a8380f512
2012-08-01T21:31:36
vmod: remove unused fields Signed-off-by: Ran Benita <ran234@gmail.com>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55
diff --git a/src/xkbcomp/vmod.c b/src/xkbcomp/vmod.c
index 593cd13..5190919 100644
--- a/src/xkbcomp/vmod.c
+++ b/src/xkbcomp/vmod.c
@@ -30,7 +30,6 @@ void
InitVModInfo(VModInfo *info, struct xkb_keymap *keymap)
{
ClearVModInfo(info, keymap);
- info->errorCount = 0;
}
void
@@ -39,7 +38,7 @@ ClearVModInfo(VModInfo *info, struct xkb_keymap *keymap)
xkb_mod_index_t i;
xkb_mod_mask_t bit;
- info->newlyDefined = info->defined = info->available = 0;
+ info->defined = info->available = 0;
for (i = 0; i < XkbNumVirtualMods; i++)
keymap->vmods[i] = XkbNoModifierMask;
@@ -126,7 +125,6 @@ HandleVModDef(VModDef *stmt, struct xkb_keymap *keymap,
}
info->defined |= (1 << nextFree);
- info->newlyDefined |= (1 << nextFree);
info->available |= (1 << nextFree);
keymap->vmod_names[nextFree] = xkb_atom_text(keymap->ctx, stmt->name);
diff --git a/src/xkbcomp/vmod.h b/src/xkbcomp/vmod.h
index cdbb624..62854d9 100644
--- a/src/xkbcomp/vmod.h
+++ b/src/xkbcomp/vmod.h
@@ -33,8 +33,6 @@
typedef struct _VModInfo {
xkb_mod_mask_t defined;
xkb_mod_mask_t available;
- xkb_mod_mask_t newlyDefined;
- int errorCount;
} VModInfo;
extern void
@@ -45,11 +43,7 @@ ClearVModInfo(VModInfo *info, struct xkb_keymap *keymap);
extern bool
HandleVModDef(VModDef *stmt, struct xkb_keymap *keymap,
- enum merge_mode mergeMode,
- VModInfo *info);
-
-extern bool
-ApplyVModDefs(VModInfo *info, struct xkb_keymap *keymap);
+ enum merge_mode mergeMode, VModInfo *info);
xkb_mod_index_t
FindKeypadVMod(struct xkb_keymap *keymap);