From 9aee332e9fd470580611d789d8265f983b199fde Mon Sep 17 00:00:00 2001 From: Ran Benita Date: Tue, 18 Sep 2012 17:31:55 +0300 Subject: [PATCH] Fix a couple of mistakes from previous commits Signed-off-by: Ran Benita --- src/xkbcomp/include.c | 2 +- src/xkbcomp/symbols.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/xkbcomp/include.c b/src/xkbcomp/include.c index 1090e83..129b1ff 100644 --- a/src/xkbcomp/include.c +++ b/src/xkbcomp/include.c @@ -238,7 +238,7 @@ FindFileInXkbPath(struct xkb_context *ctx, const char *name, log_err(ctx, "Couldn't find file \"%s/%s\" in include paths\n", typeDir, name); - if (xkb_context_num_failed_include_paths(ctx) > 0) { + if (xkb_context_num_include_paths(ctx) > 0) { log_err(ctx, "%d include paths searched:\n", xkb_context_num_include_paths(ctx)); for (i = 0; i < xkb_context_num_include_paths(ctx); i++) diff --git a/src/xkbcomp/symbols.c b/src/xkbcomp/symbols.c index 158ccaf..278732c 100644 --- a/src/xkbcomp/symbols.c +++ b/src/xkbcomp/symbols.c @@ -1535,7 +1535,7 @@ out_of_loops: log_vrb(info->keymap->ctx, 5, "No automatic type for %d levels; " "Using %s for the %s key\n", - darray_size(groupi->levels), + (int) darray_size(groupi->levels), xkb_atom_text(keymap->ctx, groupi->type), LongKeyNameText(keyi->name)); } @@ -1567,7 +1567,7 @@ out_of_loops: xkb_atom_text(keymap->ctx, type->name), type->num_levels, LongKeyNameText(keyi->name), - darray_size(groupi->levels)); + (int) darray_size(groupi->levels)); darray_resize(groupi->levels, type->num_levels); } -- 2.7.4