mirror of
https://github.com/X11Libre/xserver.git
synced 2026-03-25 08:29:23 +00:00
xkb: inline SProcXkbGetMap()
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
39f9bbd827
commit
9879290e2f
@@ -1377,6 +1377,13 @@ ProcXkbGetMap(ClientPtr client)
|
||||
REQUEST(xkbGetMapReq);
|
||||
REQUEST_SIZE_MATCH(xkbGetMapReq);
|
||||
|
||||
if (client->swapped) {
|
||||
swaps(&stuff->deviceSpec);
|
||||
swaps(&stuff->full);
|
||||
swaps(&stuff->partial);
|
||||
swaps(&stuff->virtualMods);
|
||||
}
|
||||
|
||||
if (!(client->xkbClientFlags & _XkbClientInitialized))
|
||||
return BadAccess;
|
||||
|
||||
|
||||
@@ -202,18 +202,6 @@ SProcXkbSetControls(ClientPtr client)
|
||||
return ProcXkbSetControls(client);
|
||||
}
|
||||
|
||||
static int _X_COLD
|
||||
SProcXkbGetMap(ClientPtr client)
|
||||
{
|
||||
REQUEST(xkbGetMapReq);
|
||||
REQUEST_SIZE_MATCH(xkbGetMapReq);
|
||||
swaps(&stuff->deviceSpec);
|
||||
swaps(&stuff->full);
|
||||
swaps(&stuff->partial);
|
||||
swaps(&stuff->virtualMods);
|
||||
return ProcXkbGetMap(client);
|
||||
}
|
||||
|
||||
static int _X_COLD
|
||||
SProcXkbSetMap(ClientPtr client)
|
||||
{
|
||||
@@ -352,7 +340,7 @@ SProcXkbDispatch(ClientPtr client)
|
||||
case X_kbSetControls:
|
||||
return SProcXkbSetControls(client);
|
||||
case X_kbGetMap:
|
||||
return SProcXkbGetMap(client);
|
||||
return ProcXkbGetMap(client);
|
||||
case X_kbSetMap:
|
||||
return SProcXkbSetMap(client);
|
||||
case X_kbGetCompatMap:
|
||||
|
||||
Reference in New Issue
Block a user