X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fxkbcomp%2Finclude.c;h=d47156effa3723ce9919d22ee04fa2b256e2b415;hb=c0065c95a479c7111417a6547d26594a5e31378b;hp=fc692fb13fe4785e423826a4af3857971b336979;hpb=a83d745b62ea8ec89e939b00bb3754ad54280942;p=platform%2Fupstream%2Flibxkbcommon.git diff --git a/src/xkbcomp/include.c b/src/xkbcomp/include.c index fc692fb..d47156e 100644 --- a/src/xkbcomp/include.c +++ b/src/xkbcomp/include.c @@ -201,29 +201,29 @@ LogIncludePaths(struct xkb_context *ctx) unsigned int i; if (xkb_context_num_include_paths(ctx) > 0) { - log_err_with_code(ctx, + log_err(ctx, XKB_ERROR_INCLUDED_FILE_NOT_FOUND, "%d include paths searched:\n", xkb_context_num_include_paths(ctx)); for (i = 0; i < xkb_context_num_include_paths(ctx); i++) - log_err_with_code(ctx, + log_err(ctx, XKB_ERROR_INCLUDED_FILE_NOT_FOUND, "\t%s\n", xkb_context_include_path_get(ctx, i)); } else { - log_err_with_code(ctx, + log_err(ctx, XKB_ERROR_INCLUDED_FILE_NOT_FOUND, "There are no include paths to search\n"); } if (xkb_context_num_failed_include_paths(ctx) > 0) { - log_err_with_code(ctx, + log_err(ctx, XKB_ERROR_INCLUDED_FILE_NOT_FOUND, "%d include paths could not be added:\n", xkb_context_num_failed_include_paths(ctx)); for (i = 0; i < xkb_context_num_failed_include_paths(ctx); i++) - log_err_with_code(ctx, + log_err(ctx, XKB_ERROR_INCLUDED_FILE_NOT_FOUND, "\t%s\n", xkb_context_failed_include_path_get(ctx, i)); @@ -256,7 +256,7 @@ FindFileInXkbPath(struct xkb_context *ctx, const char *name, buf = asprintf_safe("%s/%s/%s", xkb_context_include_path_get(ctx, i), typeDir, name); if (!buf) { - log_err_with_code(ctx, + log_err(ctx, XKB_ERROR_ALLOCATION_ERROR, "Failed to alloc buffer for (%s/%s/%s)\n", xkb_context_include_path_get(ctx, i), typeDir, name); @@ -276,7 +276,7 @@ FindFileInXkbPath(struct xkb_context *ctx, const char *name, /* We only print warnings if we can't find the file on the first lookup */ if (*offset == 0) { - log_err_with_code(ctx, + log_err(ctx, XKB_ERROR_INCLUDED_FILE_NOT_FOUND, "Couldn't find file \"%s/%s\" in include paths\n", typeDir, name); @@ -306,7 +306,7 @@ ProcessIncludeFile(struct xkb_context *ctx, IncludeStmt *stmt, if (xkb_file) { if (xkb_file->file_type != file_type) { - log_err_with_code(ctx, + log_err(ctx, XKB_ERROR_INVALID_INCLUDED_FILE, "Include file of wrong type (expected %s, got %s); " "Include file \"%s\" ignored\n", @@ -325,12 +325,12 @@ ProcessIncludeFile(struct xkb_context *ctx, IncludeStmt *stmt, if (!xkb_file) { if (stmt->map) - log_err_with_code(ctx, + log_err(ctx, XKB_ERROR_INVALID_INCLUDED_FILE, "Couldn't process include statement for '%s(%s)'\n", stmt->file, stmt->map); else - log_err_with_code(ctx, + log_err(ctx, XKB_ERROR_INVALID_INCLUDED_FILE, "Couldn't process include statement for '%s'\n", stmt->file);