From 33f1b0aeea5a2bc9100360f14f7da1a4f61c3c01 Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Sat, 7 Mar 2015 14:30:56 -0500 Subject: libsystemd-terminal: use at most LOG_ERR for XKB errors 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). --- src/libsystemd-terminal/idev-keyboard.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src/libsystemd-terminal') diff --git a/src/libsystemd-terminal/idev-keyboard.c b/src/libsystemd-terminal/idev-keyboard.c index 1ee13ffd15..f90f1b56d5 100644 --- a/src/libsystemd-terminal/idev-keyboard.c +++ b/src/libsystemd-terminal/idev-keyboard.c @@ -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); -- cgit v1.2.3-54-g00ecf