From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:55699) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvWfi-00055A-86 for qemu-devel@nongnu.org; Wed, 16 Jan 2013 12:21:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TvWfb-0006CO-8S for qemu-devel@nongnu.org; Wed, 16 Jan 2013 12:21:05 -0500 Received: from oxygen.pond.sub.org ([2a01:4f8:121:10e4::3]:42143) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvWfb-0006CC-1z for qemu-devel@nongnu.org; Wed, 16 Jan 2013 12:20:59 -0500 From: Markus Armbruster Date: Wed, 16 Jan 2013 18:20:57 +0100 Message-Id: <1358356857-29001-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH] ui: Drop useless null tests in parse_keyboard_layout() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com Spotted by Coverity. Signed-off-by: Markus Armbruster --- 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