picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

libsystemd-terminal: use at most LOG_ERR for XKB errors

Browse source 
XKB errors aren't *that* important.

Coverity complained that the same action is taken in multiple
branches, which is semi-valid, so is fixed too (CID #1256582).
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2015-03-07 14:30:56 -05:00
parent dcee01125d
commit 33f1b0aeea
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/libsystemd-terminal/idev-keyboard.c
View file

@ -506,12 +506,9 @@ static void kbdctx_log_fn(struct xkb_context *ctx, enum xkb_log_level lvl, const
sd_lvl = LOG_INFO;
else if (lvl >= XKB_LOG_LEVEL_WARNING)
sd_lvl = LOG_INFO; /* most XKB warnings really are informational */
else if (lvl >= XKB_LOG_LEVEL_ERROR)
sd_lvl = LOG_ERR;
else if (lvl >= XKB_LOG_LEVEL_CRITICAL)
sd_lvl = LOG_CRIT;
else
sd_lvl = LOG_CRIT;
/* XKB_LOG_LEVEL_ERROR and worse */
sd_lvl = LOG_ERR;
snprintf(buf, sizeof(buf), "idev-xkb: %s", format);
log_internalv(sd_lvl, 0, __FILE__, __LINE__, __func__, buf, args);