ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Markus Armbruster 2013-01-16 18:20:57 +01:00 committed by Anthony Liguori
parent 4ecf8aa5a0
commit 955d7b2677
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ui/keymaps.c
View File

@ -127,25 +127,27 @@ static kbd_layout_t *parse_keyboard_layout(const name2keysym_t *table,
// fprintf(stderr, "Warning: unknown keysym %s\n", line); // fprintf(stderr, "Warning: unknown keysym %s\n", line);
} else { } else {
const char *rest = end_of_keysym + 1; const char *rest = end_of_keysym + 1;
char *rest2; int keycode = strtol(rest, NULL, 0);
int keycode = strtol(rest, &rest2, 0);
if (rest && strstr(rest, "numlock")) { if (strstr(rest, "numlock")) {
add_to_key_range(&k->keypad_range, keycode); add_to_key_range(&k->keypad_range, keycode);
add_to_key_range(&k->numlock_range, keysym); add_to_key_range(&k->numlock_range, keysym);
//fprintf(stderr, "keypad keysym %04x keycode %d\n", keysym, keycode); //fprintf(stderr, "keypad keysym %04x keycode %d\n", keysym, keycode);
} }
if (rest && strstr(rest, "shift")) if (strstr(rest, "shift")) {
keycode |= SCANCODE_SHIFT; keycode |= SCANCODE_SHIFT;
if (rest && strstr(rest, "altgr")) }
if (strstr(rest, "altgr")) {
keycode |= SCANCODE_ALTGR; keycode |= SCANCODE_ALTGR;
if (rest && strstr(rest, "ctrl")) }
if (strstr(rest, "ctrl")) {
keycode |= SCANCODE_CTRL; keycode |= SCANCODE_CTRL;
}
add_keysym(line, keysym, keycode, k); add_keysym(line, keysym, keycode, k);
if (rest && strstr(rest, "addupper")) { if (strstr(rest, "addupper")) {
char *c; char *c;
for (c = line; *c; c++) for (c = line; *c; c++)
*c = qemu_toupper(*c); *c = qemu_toupper(*c);