XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-03-24 01:34:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

xkb: inline SProcXkbGetDeviceInfo()

Browse Source 
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:
Enrico Weigelt, metux IT consult
2025-09-24 16:42:46 +02:00
committed by Enrico Weigelt
parent 9eba2365c9
commit 8c545a6528
2 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
xkb/xkb.c
View File

@@ -6198,15 +6198,22 @@ FillDeviceLedFBs(DeviceIntPtr dev, int class, int id, unsigned wantLength,
int
ProcXkbGetDeviceInfo(ClientPtr client)
{
REQUEST(xkbGetDeviceInfoReq);
REQUEST_SIZE_MATCH(xkbGetDeviceInfoReq);
if (client->swapped) {
swaps(&stuff->deviceSpec);
swaps(&stuff->wanted);
swaps(&stuff->ledClass);
swaps(&stuff->ledID);
}
DeviceIntPtr dev;
int status;
unsigned length, nameLen;
CARD16 ledClass, ledID;
unsigned wanted;
REQUEST(xkbGetDeviceInfoReq);
REQUEST_SIZE_MATCH(xkbGetDeviceInfoReq);
if (!(client->xkbClientFlags & _XkbClientInitialized))
return BadAccess;

14
xkb/xkbSwap.c
View File

@@ -363,18 +363,6 @@ SProcXkbGetKbdByName(ClientPtr client)
return ProcXkbGetKbdByName(client);
}
static int _X_COLD
SProcXkbGetDeviceInfo(ClientPtr client)
{
REQUEST(xkbGetDeviceInfoReq);
REQUEST_SIZE_MATCH(xkbGetDeviceInfoReq);
swaps(&stuff->deviceSpec);
swaps(&stuff->wanted);
swaps(&stuff->ledClass);
swaps(&stuff->ledID);
return ProcXkbGetDeviceInfo(client);
}
static int _X_COLD
SProcXkbSetDeviceInfo(ClientPtr client)
{
@@ -451,7 +439,7 @@ SProcXkbDispatch(ClientPtr client)
case X_kbGetKbdByName:
return SProcXkbGetKbdByName(client);
case X_kbGetDeviceInfo:
return SProcXkbGetDeviceInfo(client);
return ProcXkbGetDeviceInfo(client);
case X_kbSetDeviceInfo:
return SProcXkbSetDeviceInfo(client);
case X_kbSetDebuggingFlags: