summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJihoon Kim <jihoon48.kim@samsung.com>2023-12-22 10:30:21 +0900
committerJihoon Kim <jihoon48.kim@samsung.com>2023-12-22 10:30:21 +0900
commitbb60713620f4f061bb5baa42a2f0ecf0655f1220 (patch)
treecbf3b3a2cccba6d591ea30eb0933866399c4406e
parent6df61b72c999e4a2e4bc753dcfb4ef06b1d10224 (diff)
downloadlibxkbcommon-bb60713620f4f061bb5baa42a2f0ecf0655f1220.tar.gz
libxkbcommon-bb60713620f4f061bb5baa42a2f0ecf0655f1220.tar.bz2
libxkbcommon-bb60713620f4f061bb5baa42a2f0ecf0655f1220.zip
Fix build error
Change-Id: Ibaa726eb7ab77b4a9a51a7d3670bd27f8701fcf5 Signed-off-by: Jihoon Kim <jihoon48.kim@samsung.com>
-rw-r--r--src/compose/table.c3
-rw-r--r--src/xkbcomp/symbols.c5
2 files changed, 5 insertions, 3 deletions
diff --git a/src/compose/table.c b/src/compose/table.c
index 3f50d3d..e082485 100644
--- a/src/compose/table.c
+++ b/src/compose/table.c
@@ -212,7 +212,8 @@ xkb_compose_table_new_from_locale(struct xkb_context *ctx,
// TIZEN_ONLY(20210525)
// : fix not to display error log about the absense of compose file
if (!strncmp("en_US.UTF-8", locale, 11)) {
- log_err(ctx, "couldn't find a Compose file for locale \"%s\" (mapped to \"%s\")\n",
+ log_err(ctx, XKB_LOG_MESSAGE_NO_ID,
+ "couldn't find a Compose file for locale \"%s\" (mapped to \"%s\")\n",
locale, table->locale);
}
// END
diff --git a/src/xkbcomp/symbols.c b/src/xkbcomp/symbols.c
index c79241e..86cb843 100644
--- a/src/xkbcomp/symbols.c
+++ b/src/xkbcomp/symbols.c
@@ -721,7 +721,7 @@ AddSymbolsToKey(SymbolsInfo *info, KeyInfo *keyi, ExprDef *arrayNdx,
if (leveli->num_syms > 1) {
leveli->u.syms = calloc(leveli->num_syms, sizeof(*leveli->u.syms));
if (!leveli->u.syms) {
- log_err(info->ctx, "Failed to allocate memory for leveli->u.syms\n");
+ log_err(info->ctx, XKB_ERROR_ALLOCATION_ERROR, "Failed to allocate memory for leveli->u.syms\n");
continue;
}
}
@@ -795,6 +795,7 @@ AddActionsToKey(SymbolsInfo *info, KeyInfo *keyi, ExprDef *arrayNdx,
if (act) {
if (!HandleActionDef(info->ctx, info->actions, &info->mods, act, toAct))
log_err(info->ctx,
+ XKB_ERROR_INVALID_VALUE,
"Illegal action definition for %s; "
"Action for group %u/level %u ignored\n",
KeyInfoText(info, keyi), ndx + 1, i + 1);
@@ -1501,7 +1502,7 @@ CopySymbolsDefToKeymap(struct xkb_keymap *keymap, SymbolsInfo *info,
key->groups = calloc(key->num_groups, sizeof(*key->groups));
if (!key->groups) {
- log_err(info->ctx, "Failed to allocate memory for key->groups\n");
+ log_err(info->ctx, XKB_ERROR_ALLOCATION_ERROR, "Failed to allocate memory for key->groups\n");
return false;
}