From: Jihoon Kim Date: Fri, 22 Dec 2023 01:30:21 +0000 (+0900) Subject: Fix build error X-Git-Tag: accepted/tizen/unified/20240109.155348~4 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;ds=sidebyside;h=bb60713620f4f061bb5baa42a2f0ecf0655f1220;p=platform%2Fupstream%2Flibxkbcommon.git Fix build error Change-Id: Ibaa726eb7ab77b4a9a51a7d3670bd27f8701fcf5 Signed-off-by: Jihoon Kim --- 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; }