diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2012-08-08 13:30:05 +0200 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2012-08-08 13:30:24 +0200 |
| commit | 26c01d3bb4ed0bf31d915bae84bf06661c2f341f (patch) | |
| tree | e65484a30d13e6090f66f62a20230d186493cc08 | |
| parent | 1a930bf256d87a0edde66a0b00271e3faf664d45 (diff) | |
Warning fixes
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
| -rw-r--r-- | src/map.c | 2 | ||||
| -rw-r--r-- | src/xkbcomp/keytypes.c | 1 |
2 files changed, 2 insertions, 1 deletions
@@ -366,7 +366,7 @@ xkb_key_mod_index_is_consumed(struct xkb_state *state, xkb_keycode_t kc, xkb_group_index_t group; struct xkb_key_type *type; unsigned int i; - struct xkb_kt_map_entry *entry; + struct xkb_kt_map_entry *entry = NULL; xkb_mod_mask_t active_mods; if (!XkbKeycodeInRange(keymap, kc)) diff --git a/src/xkbcomp/keytypes.c b/src/xkbcomp/keytypes.c index db654b0..878f10e 100644 --- a/src/xkbcomp/keytypes.c +++ b/src/xkbcomp/keytypes.c @@ -877,6 +877,7 @@ HandleKeyTypesFile(KeyTypesInfo *info, XkbFile *file, enum merge_mode merge) log_err(info->keymap->ctx, "Support for changing the default type has been removed; " "Statement ignored\n"); + ok = true; break; case STMT_VMOD: /* virtual_modifiers NumLock, ... */ ok = HandleVModDef((VModDef *) stmt, info->keymap, merge, |