Commit 1f4009d4e9fff7976d6e19288f049952ff4513c0
2012-10-04T19:44:47
vmod: remove merge argument from HandleVModDef It's unused and unneeded. 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 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70
diff --git a/src/xkbcomp/compat.c b/src/xkbcomp/compat.c
index 8e15f12..d883ab3 100644
--- 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
--- 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
--- 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
--- 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
--- 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,