summaryrefslogtreecommitdiff
path: root/xkb
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@redhat.com>2008-10-31 18:32:26 +1030
committerPeter Hutterer <peter.hutterer@redhat.com>2008-10-31 18:36:14 +1030
commit0a076b6a7f3c97ff712412eee32e013d3bfd7364 (patch)
tree8ac143c1f4ad8568b485168a036d7eba2b946b49 /xkb
parent971aef64416058665bc903fee39fea1619cd3727 (diff)
xkb: remove unused label "out", clean up program flow.
Diffstat (limited to 'xkb')
-rw-r--r--xkb/xkbUtils.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c
index 7e9f8d0e8..61d37af24 100644
--- a/xkb/xkbUtils.c
+++ b/xkb/xkbUtils.c
@@ -81,12 +81,10 @@ _XkbLookupAnyDevice(DeviceIntPtr *pDev, int id, ClientPtr client,
if (id == XkbUseCoreKbd) {
id = PickKeyboard(client)->id;
- }
- if (id == XkbUseCorePtr) {
+ } else if (id == XkbUseCorePtr) {
id = PickPointer(client)->id;
}
rc = dixLookupDevice(pDev, id, client, access_mode);
-out:
if (rc != Success)
*xkb_err = XkbErr_BadDevice;
return rc;