From 26c01d3bb4ed0bf31d915bae84bf06661c2f341f Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Wed, 8 Aug 2012 13:30:05 +0200 Subject: [PATCH] Warning fixes Signed-off-by: Daniel Stone --- src/map.c | 2 +- src/xkbcomp/keytypes.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/map.c b/src/map.c index 91712b5..aa6b08b 100644 --- a/src/map.c +++ b/src/map.c @@ -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, -- 2.7.4