vmod: remove merge argument from HandleVModDef

It's unused and unneeded.

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

diff --git a/src/xkbcomp/compat.c b/src/xkbcomp/compat.c
index 8e15f12..d883ab3 100644 (file)
--- a/src/xkbcomp/compat.c
+++ b/src/xkbcomp/compat.c
@@ -898,8 +898,7 @@ HandleCompatMapFile(CompatInfo *info, XkbFile *file, enum merge_mode merge)
             ok = HandleGlobalVar(info, (VarDef *) stmt);
             break;
         case STMT_VMOD:
-            ok = HandleVModDef((VModDef *) stmt, info->keymap, merge,
-                               &info->vmods);
+            ok = HandleVModDef((VModDef *) stmt, info->keymap, &info->vmods);
             break;
         default:
             log_err(info->keymap->ctx,

diff --git a/src/xkbcomp/symbols.c b/src/xkbcomp/symbols.c
index 8c1abc8..bb6ccc6 100644 (file)
--- a/src/xkbcomp/symbols.c
+++ b/src/xkbcomp/symbols.c
@@ -1268,8 +1268,7 @@ HandleSymbolsFile(SymbolsInfo *info, XkbFile *file, enum merge_mode merge)
             ok = HandleGlobalVar(info, (VarDef *) stmt);
             break;
         case STMT_VMOD:
-            ok = HandleVModDef((VModDef *) stmt, info->keymap, merge,
-                               &info->vmods);
+            ok = HandleVModDef((VModDef *) stmt, info->keymap, &info->vmods);
             break;
         case STMT_MODMAP:
             ok = HandleModMapDef(info, (ModMapDef *) stmt);

diff --git a/src/xkbcomp/types.c b/src/xkbcomp/types.c
index ca73272..73c1427 100644 (file)
--- a/src/xkbcomp/types.c
+++ b/src/xkbcomp/types.c
@@ -761,8 +761,7 @@ HandleKeyTypesFile(KeyTypesInfo *info, XkbFile *file, enum merge_mode merge)
             ok = true;
             break;
         case STMT_VMOD: /* virtual_modifiers NumLock, ... */
-            ok = HandleVModDef((VModDef *) stmt, info->keymap, merge,
-                               &info->vmods);
+            ok = HandleVModDef((VModDef *) stmt, info->keymap, &info->vmods);
             break;
         default:
             log_err(info->keymap->ctx,

diff --git a/src/xkbcomp/vmod.c b/src/xkbcomp/vmod.c
index a1d6bf0..ebd5371 100644 (file)
--- a/src/xkbcomp/vmod.c
+++ b/src/xkbcomp/vmod.c
@@ -40,8 +40,7 @@ InitVModInfo(VModInfo *info, struct xkb_keymap *keymap)
 }
 
 bool
-HandleVModDef(VModDef *stmt, struct xkb_keymap *keymap,
-              enum merge_mode mergeMode, VModInfo *info)
+HandleVModDef(VModDef *stmt, struct xkb_keymap *keymap, VModInfo *info)
 {
     xkb_mod_index_t i;
     const struct xkb_vmod *vmod;

diff --git a/src/xkbcomp/vmod.h b/src/xkbcomp/vmod.h
index a53a14b..6fdd891 100644 (file)
--- a/src/xkbcomp/vmod.h
+++ b/src/xkbcomp/vmod.h
@@ -36,8 +36,7 @@ void
 InitVModInfo(VModInfo *info, struct xkb_keymap *keymap);
 
 bool
-HandleVModDef(VModDef *stmt, struct xkb_keymap *keymap,
-              enum merge_mode mergeMode, VModInfo *info);
+HandleVModDef(VModDef *stmt, struct xkb_keymap *keymap, VModInfo *info);
 
 bool
 ResolveVirtualModifier(ExprDef *def, struct xkb_keymap *keymap,