* [Qemu-devel] [PATCH] ui: Drop useless null tests in parse_keyboard_layout()
@ 2013-01-16 17:20 Markus Armbruster
2013-01-16 21:13 ` Anthony Liguori
0 siblings, 1 reply; 2+ messages in thread
From: Markus Armbruster @ 2013-01-16 17:20 UTC (permalink / raw)
To: qemu-devel; +Cc: aliguori
Spotted by Coverity.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
ui/keymaps.c | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/ui/keymaps.c b/ui/keymaps.c
index 9625d82..f373cc5 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);
--
1.7.11.7
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Qemu-devel] [PATCH] ui: Drop useless null tests in parse_keyboard_layout()
2013-01-16 17:20 [Qemu-devel] [PATCH] ui: Drop useless null tests in parse_keyboard_layout() Markus Armbruster
@ 2013-01-16 21:13 ` Anthony Liguori
0 siblings, 0 replies; 2+ messages in thread
From: Anthony Liguori @ 2013-01-16 21:13 UTC (permalink / raw)
To: Markus Armbruster, qemu-devel; +Cc: aliguori
Applied. Thanks.
Regards,
Anthony Liguori
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-01-16 21:14 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-16 17:20 [Qemu-devel] [PATCH] ui: Drop useless null tests in parse_keyboard_layout() Markus Armbruster
2013-01-16 21:13 ` Anthony Liguori
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).