diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2014-10-31 09:29:33 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2014-11-12 10:25:00 +1000 |
| commit | 04ca16997994c7561ed8948b89fc1c922233da13 (patch) | |
| tree | c157eaed6b0e31cab4ceee3df8dce74a3531268f | |
| parent | 79b9d33545034f2952ebc7e444c201693b45f44b (diff) | |
dix: silence compiler warning
inpututils.c:243:26: warning: comparison of constant 256 with expression of
type 'KeyCode' (aka 'unsigned char') is always false
[-Wtautological-constant-out-of-range-compare]
if (modkeymap[i] >= MAP_LENGTH)
~~~~~~~~~~~~ ^ ~~~~~~~~~~
MAP_LENGTH depends on MAX_BUTTONS which is somewhat arbitrarily chosen. We
don't expect this to ever change, but just in case leave the condition there
so the code is correct if we drop the number down.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | dix/inpututils.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/dix/inpututils.c b/dix/inpututils.c index e5bcc31f7..5c2a32d1c 100644 --- a/dix/inpututils.c +++ b/dix/inpututils.c @@ -239,8 +239,10 @@ build_modmap_from_modkeymap(CARD8 *modmap, KeyCode *modkeymap, if (!modkeymap[i]) continue; +#if MAP_LENGTH < 256 if (modkeymap[i] >= MAP_LENGTH) return BadValue; +#endif if (modmap[modkeymap[i]]) return BadValue; |