diff options
| author | Markus Armbruster <armbru@redhat.com> | 2013-01-16 18:20:57 +0100 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-01-16 12:02:47 -0600 |
| commit | 955d7b26779d6654f6ba2c456bac9fd49fa0cd8a (patch) | |
| tree | 9e64dbfcbc3a17995e113fdbf4b5d814d4f9e1c8 | |
| parent | 4ecf8aa5a06a830b05c035a5d6184bf991931d20 (diff) | |
| download | qemu-955d7b26779d6654f6ba2c456bac9fd49fa0cd8a.tar.gz qemu-955d7b26779d6654f6ba2c456bac9fd49fa0cd8a.tar.bz2 qemu-955d7b26779d6654f6ba2c456bac9fd49fa0cd8a.zip | |
ui: Drop useless null tests in parse_keyboard_layout()
Spotted by Coverity.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| -rw-r--r-- | ui/keymaps.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/ui/keymaps.c b/ui/keymaps.c index 9625d82fa1..f373cc53d9 100644 --- a/ui/keymaps.c +++ b/ui/keymaps.c @@ -127,25 +127,27 @@ static kbd_layout_t *parse_keyboard_layout(const name2keysym_t *table, // fprintf(stderr, "Warning: unknown keysym %s\n", line); } else { const char *rest = end_of_keysym + 1; - char *rest2; - int keycode = strtol(rest, &rest2, 0); + int keycode = strtol(rest, NULL, 0); - if (rest && strstr(rest, "numlock")) { + if (strstr(rest, "numlock")) { add_to_key_range(&k->keypad_range, keycode); add_to_key_range(&k->numlock_range, keysym); //fprintf(stderr, "keypad keysym %04x keycode %d\n", keysym, keycode); } - if (rest && strstr(rest, "shift")) + if (strstr(rest, "shift")) { keycode |= SCANCODE_SHIFT; - if (rest && strstr(rest, "altgr")) + } + if (strstr(rest, "altgr")) { keycode |= SCANCODE_ALTGR; - if (rest && strstr(rest, "ctrl")) + } + if (strstr(rest, "ctrl")) { keycode |= SCANCODE_CTRL; + } add_keysym(line, keysym, keycode, k); - if (rest && strstr(rest, "addupper")) { + if (strstr(rest, "addupper")) { char *c; for (c = line; *c; c++) *c = qemu_toupper(*c); |