mirror of
https://github.com/X11Libre/xserver.git
synced 2026-03-24 16:44:52 +00:00
xkb: inline SProcXkbSetDeviceInfo()
No need to have whole extra functions for just a few LoC. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
committed by
Enrico Weigelt
parent
e446fdc14a
commit
335dd555fe
12
xkb/xkb.c
12
xkb/xkb.c
@@ -6748,12 +6748,18 @@ _XkbSetDeviceInfo(ClientPtr client, DeviceIntPtr dev,
|
||||
int
|
||||
ProcXkbSetDeviceInfo(ClientPtr client)
|
||||
{
|
||||
DeviceIntPtr dev;
|
||||
int rc;
|
||||
|
||||
REQUEST(xkbSetDeviceInfoReq);
|
||||
REQUEST_AT_LEAST_SIZE(xkbSetDeviceInfoReq);
|
||||
|
||||
if (client->swapped) {
|
||||
swaps(&stuff->deviceSpec);
|
||||
swaps(&stuff->change);
|
||||
swaps(&stuff->nDeviceLedFBs);
|
||||
}
|
||||
|
||||
DeviceIntPtr dev;
|
||||
int rc;
|
||||
|
||||
if (!(client->xkbClientFlags & _XkbClientInitialized))
|
||||
return BadAccess;
|
||||
|
||||
|
||||
@@ -160,17 +160,6 @@ SProcXkbGetKbdByName(ClientPtr client)
|
||||
return ProcXkbGetKbdByName(client);
|
||||
}
|
||||
|
||||
static int _X_COLD
|
||||
SProcXkbSetDeviceInfo(ClientPtr client)
|
||||
{
|
||||
REQUEST(xkbSetDeviceInfoReq);
|
||||
REQUEST_AT_LEAST_SIZE(xkbSetDeviceInfoReq);
|
||||
swaps(&stuff->deviceSpec);
|
||||
swaps(&stuff->change);
|
||||
swaps(&stuff->nDeviceLedFBs);
|
||||
return ProcXkbSetDeviceInfo(client);
|
||||
}
|
||||
|
||||
int _X_COLD
|
||||
SProcXkbDispatch(ClientPtr client)
|
||||
{
|
||||
@@ -225,7 +214,7 @@ SProcXkbDispatch(ClientPtr client)
|
||||
case X_kbGetDeviceInfo:
|
||||
return ProcXkbGetDeviceInfo(client);
|
||||
case X_kbSetDeviceInfo:
|
||||
return SProcXkbSetDeviceInfo(client);
|
||||
return ProcXkbSetDeviceInfo(client);
|
||||
case X_kbSetDebuggingFlags:
|
||||
return ProcXkbSetDebuggingFlags(client);
|
||||
default:
|
||||
|
||||
Reference in New Issue
Block a user