diff options
| -rw-r--r-- | src/keysym.c | 2 | ||||
| -rw-r--r-- | src/x11/keymap.c | 6 | ||||
| -rw-r--r-- | src/xkbcomp/compat.c | 2 | ||||
| -rw-r--r-- | src/xkbcomp/keymap-dump.c | 2 | ||||
| -rw-r--r-- | src/xkbcomp/keymap.c | 2 | ||||
| -rw-r--r-- | test/interactive-evdev.c | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/src/keysym.c b/src/keysym.c index e8fa5e1..6f2075c 100644 --- a/src/keysym.c +++ b/src/keysym.c @@ -165,7 +165,7 @@ xkb_keysym_from_name(const char *s, enum xkb_keysym_flags flags) const struct name_keysym *entry; char *tmp; xkb_keysym_t val; - bool icase = !!(flags & XKB_KEYSYM_CASE_INSENSITIVE); + bool icase = (flags & XKB_KEYSYM_CASE_INSENSITIVE); if (flags & ~XKB_KEYSYM_CASE_INSENSITIVE) return XKB_KEY_NoSymbol; diff --git a/src/x11/keymap.c b/src/x11/keymap.c index 5b18997..ae31c29 100644 --- a/src/x11/keymap.c +++ b/src/x11/keymap.c @@ -787,7 +787,7 @@ get_sym_interprets(struct xkb_keymap *keymap, xcb_connection_t *conn, } sym_interpret->level_one_only = - !!(wire->match & XCB_XKB_SYM_INTERP_MATCH_LEVEL_ONE_ONLY); + (wire->match & XCB_XKB_SYM_INTERP_MATCH_LEVEL_ONE_ONLY); sym_interpret->mods = wire->mods; if (wire->virtualMod == NO_MODIFIER) @@ -795,7 +795,7 @@ get_sym_interprets(struct xkb_keymap *keymap, xcb_connection_t *conn, else sym_interpret->virtual_mod = NUM_REAL_MODS + wire->virtualMod; - sym_interpret->repeat = !!(wire->flags & 0x01); + sym_interpret->repeat = (wire->flags & 0x01); translate_action(&sym_interpret->action, (xcb_xkb_action_t *) &wire->action); @@ -1113,7 +1113,7 @@ get_controls(struct xkb_keymap *keymap, xcb_connection_t *conn, FAIL_UNLESS(keymap->max_key_code < XCB_XKB_CONST_PER_KEY_BIT_ARRAY_SIZE * 8); for (xkb_keycode_t i = keymap->min_key_code; i <= keymap->max_key_code; i++) - keymap->keys[i].repeats = !!(reply->perKeyRepeat[i / 8] & (1 << (i % 8))); + keymap->keys[i].repeats = (reply->perKeyRepeat[i / 8] & (1 << (i % 8))); free(reply); return true; diff --git a/src/xkbcomp/compat.c b/src/xkbcomp/compat.c index f8a497b..ac06ea4 100644 --- a/src/xkbcomp/compat.c +++ b/src/xkbcomp/compat.c @@ -516,7 +516,7 @@ SetInterpField(CompatInfo *info, SymInterpInfo *si, const char *field, if (!ExprResolveEnum(info->ctx, value, &val, useModMapValueNames)) return ReportSIBadType(info, si, field, "level specification"); - si->interp.level_one_only = !!val; + si->interp.level_one_only = val; si->defined |= SI_FIELD_LEVEL_ONE_ONLY; } else { diff --git a/src/xkbcomp/keymap-dump.c b/src/xkbcomp/keymap-dump.c index 8ebd475..775be0f 100644 --- a/src/xkbcomp/keymap-dump.c +++ b/src/xkbcomp/keymap-dump.c @@ -553,7 +553,7 @@ write_key(struct xkb_keymap *keymap, struct buf *buf, break; } - show_actions = !!(key->explicit & EXPLICIT_INTERP); + show_actions = (key->explicit & EXPLICIT_INTERP); if (key->num_groups > 1 || show_actions) simple = false; diff --git a/src/xkbcomp/keymap.c b/src/xkbcomp/keymap.c index d846fa8..cc5bc83 100644 --- a/src/xkbcomp/keymap.c +++ b/src/xkbcomp/keymap.c @@ -115,7 +115,7 @@ FindInterpForKey(struct xkb_keymap *keymap, const struct xkb_key *key, found = (!mods || (interp->mods & mods)); break; case MATCH_ANY: - found = !!(interp->mods & mods); + found = (interp->mods & mods); break; case MATCH_ALL: found = ((interp->mods & mods) == interp->mods); diff --git a/test/interactive-evdev.c b/test/interactive-evdev.c index 429e01c..e0fb470 100644 --- a/test/interactive-evdev.c +++ b/test/interactive-evdev.c @@ -53,7 +53,7 @@ static bool report_state_changes; static bool evdev_bit_is_set(const unsigned long *array, int bit) { - return !!(array[bit / LONG_BIT] & (1LL << (bit % LONG_BIT))); + return array[bit / LONG_BIT] & (1LL << (bit % LONG_BIT)); } /* Some heuristics to see if the device is a keyboard. */ |