frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

XKB: Tiny cleanups to _XkbLookupAnyDevice 

A couple of coding style cleanups, a warning fix via removing a
now-unused label, and also put an else so we don't spuriously trip a
condition that should admittedly never occur anyway.

Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
This commit is contained in:
Daniel Stone 2008-08-09 15:54:56 +03:00 committed by Peter Hutterer
parent 97c9e6a713
commit 064ee458c7
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
xkb/xkbUtils.c
View File

@ -79,14 +79,15 @@ _XkbLookupAnyDevice(DeviceIntPtr *pDev, int id, ClientPtr client,
{ {
int rc = XkbKeyboardErrorCode; int rc = XkbKeyboardErrorCode;
if (id == XkbUseCoreKbd) { if (id == XkbUseCoreKbd)
id = PickKeyboard(client)->id; id = PickKeyboard(client)->id;
} else if (id == XkbUseCorePtr) { else if (id == XkbUseCorePtr)
id = PickPointer(client)->id; id = PickPointer(client)->id;
}
rc = dixLookupDevice(pDev, id, client, access_mode); rc = dixLookupDevice(pDev, id, client, access_mode);
if (rc != Success) if (rc != Success)
*xkb_err = XkbErr_BadDevice; *xkb_err = XkbErr_BadDevice;
return rc; return rc;
} }