projects
/
platform
/
upstream
/
libxkbcommon.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Messages: merge macros with and without message code
[platform/upstream/libxkbcommon.git]
/
src
/
xkbcomp
/
include.c
diff --git
a/src/xkbcomp/include.c
b/src/xkbcomp/include.c
index
fc692fb
..
d47156e
100644
(file)
--- 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) {
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++)
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 {
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) {
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++)
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));
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) {
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);
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) {
/* 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);
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) {
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",
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)
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
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);
XKB_ERROR_INVALID_INCLUDED_FILE,
"Couldn't process include statement for '%s'\n",
stmt->file);