X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fxkbcomp%2Fexpr.c;h=f935ce6db10000b6fe243ab74357b47ca50a6155;hb=ef81d04eef4b1a60ff42bd9ccbe2918b0a5420ec;hp=bbdf0381ae581758c1ac5f414feea3d36c2a6a0d;hpb=0e3e2d17302e99e68bdab3b5db0a1dcc835e5bee;p=platform%2Fupstream%2Flibxkbcommon.git diff --git a/src/xkbcomp/expr.c b/src/xkbcomp/expr.c index bbdf038..f935ce6 100644 --- a/src/xkbcomp/expr.c +++ b/src/xkbcomp/expr.c @@ -407,8 +407,9 @@ ExprResolveGroup(struct xkb_context *ctx, const ExprDef *expr, return false; if (result <= 0 || result > XKB_MAX_GROUPS) { - log_err(ctx, "Group index %u is out of range (1..%d)\n", - result, XKB_MAX_GROUPS); + log_err_with_code(ctx, XKB_ERROR_UNSUPPORTED_GROUP_INDEX, + "Group index %u is out of range (1..%d)\n", + result, XKB_MAX_GROUPS); return false; } @@ -429,7 +430,8 @@ ExprResolveLevel(struct xkb_context *ctx, const ExprDef *expr, return false; if (result < 1) { - log_err(ctx, "Shift level %d is out of range\n", result); + log_err_with_code(ctx, XKB_ERROR_UNSUPPORTED_SHIFT_LEVEL, + "Shift level %d is out of range\n", result); return false; } @@ -658,8 +660,9 @@ ExprResolveKeySym(struct xkb_context *ctx, const ExprDef *expr, return false; if (val < XKB_KEYSYM_MIN) { - log_warn(ctx, "unrecognized keysym \"-0x%x\" (%d)\n", - (unsigned int) -val, val); + log_warn_with_code(ctx, XKB_WARNING_UNRECOGNIZED_KEYSYM, + "unrecognized keysym \"-0x%x\" (%d)\n", + (unsigned int) -val, val); return false; } @@ -674,7 +677,9 @@ ExprResolveKeySym(struct xkb_context *ctx, const ExprDef *expr, return true; } - log_warn(ctx, "unrecognized keysym \"0x%x\" (%d)\n", val, val); + log_warn_with_code(ctx, XKB_WARNING_UNRECOGNIZED_KEYSYM, + "unrecognized keysym \"0x%x\" (%d)\n", + (unsigned int) val, val); return false; }