diff options
author | Ran Benita <ran234@gmail.com> | 2014-06-01 15:24:10 +0300 |
---|---|---|
committer | Ran Benita <ran234@gmail.com> | 2014-06-01 15:24:10 +0300 |
commit | 67d884ec141a83ea87807a3b25d79075225896e8 (patch) | |
tree | d380e4350d18d2380fea5c445650b618162f8b0e /src | |
parent | d6f2d8ecd07984a2c8725090acb806a16b51738a (diff) | |
download | xorg-lib-libxkbcommon-67d884ec141a83ea87807a3b25d79075225896e8.tar.gz |
Remove unnecessary !!(expressions)
_Bool already does that.
Signed-off-by: Ran Benita <ran234@gmail.com>
Diffstat (limited to 'src')
-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 |
5 files changed, 7 insertions, 7 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); |