Commit 955d7b26 authored by Markus Armbruster's avatar Markus Armbruster Committed by Anthony Liguori
Browse files

ui: Drop useless null tests in parse_keyboard_layout()



Spotted by Coverity.
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent 4ecf8aa5
......@@ -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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment