vmod: remove unused fields

Signed-off-by: Ran Benita <ran234@gmail.com>

diff --git a/src/xkbcomp/vmod.c b/src/xkbcomp/vmod.c
index 593cd13..5190919 100644 (file)
--- 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 (file)
--- 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);