Fix a couple of mistakes from previous commits
authorRan Benita <ran234@gmail.com>
Tue, 18 Sep 2012 14:31:55 +0000 (17:31 +0300)
committerRan Benita <ran234@gmail.com>
Tue, 18 Sep 2012 14:31:55 +0000 (17:31 +0300)
Signed-off-by: Ran Benita <ran234@gmail.com>
src/xkbcomp/include.c
src/xkbcomp/symbols.c

index 1090e83..129b1ff 100644 (file)
@@ -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++)
index 158ccaf..278732c 100644 (file)
@@ -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);
         }