mirror of
https://github.com/X11Libre/xserver.git
synced 2026-03-24 03:44:06 +00:00
xkb: inline SProcXkbSetDebuggingFlags()
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
d497375eaa
commit
6df2a9a01a
14
xkb/xkb.c
14
xkb/xkb.c
@@ -6793,12 +6793,20 @@ ProcXkbSetDeviceInfo(ClientPtr client)
|
|||||||
int
|
int
|
||||||
ProcXkbSetDebuggingFlags(ClientPtr client)
|
ProcXkbSetDebuggingFlags(ClientPtr client)
|
||||||
{
|
{
|
||||||
CARD32 newFlags, newCtrls, extraLength;
|
|
||||||
int rc;
|
|
||||||
|
|
||||||
REQUEST(xkbSetDebuggingFlagsReq);
|
REQUEST(xkbSetDebuggingFlagsReq);
|
||||||
REQUEST_AT_LEAST_SIZE(xkbSetDebuggingFlagsReq);
|
REQUEST_AT_LEAST_SIZE(xkbSetDebuggingFlagsReq);
|
||||||
|
|
||||||
|
if (client->swapped) {
|
||||||
|
swapl(&stuff->affectFlags);
|
||||||
|
swapl(&stuff->flags);
|
||||||
|
swapl(&stuff->affectCtrls);
|
||||||
|
swapl(&stuff->ctrls);
|
||||||
|
swaps(&stuff->msgLength);
|
||||||
|
}
|
||||||
|
|
||||||
|
CARD32 newFlags, newCtrls, extraLength;
|
||||||
|
int rc;
|
||||||
|
|
||||||
rc = dixCallServerAccessCallback(client, DixDebugAccess);
|
rc = dixCallServerAccessCallback(client, DixDebugAccess);
|
||||||
if (rc != Success)
|
if (rc != Success)
|
||||||
return rc;
|
return rc;
|
||||||
|
|||||||
@@ -209,19 +209,6 @@ SProcXkbSetDeviceInfo(ClientPtr client)
|
|||||||
return ProcXkbSetDeviceInfo(client);
|
return ProcXkbSetDeviceInfo(client);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int _X_COLD
|
|
||||||
SProcXkbSetDebuggingFlags(ClientPtr client)
|
|
||||||
{
|
|
||||||
REQUEST(xkbSetDebuggingFlagsReq);
|
|
||||||
REQUEST_AT_LEAST_SIZE(xkbSetDebuggingFlagsReq);
|
|
||||||
swapl(&stuff->affectFlags);
|
|
||||||
swapl(&stuff->flags);
|
|
||||||
swapl(&stuff->affectCtrls);
|
|
||||||
swapl(&stuff->ctrls);
|
|
||||||
swaps(&stuff->msgLength);
|
|
||||||
return ProcXkbSetDebuggingFlags(client);
|
|
||||||
}
|
|
||||||
|
|
||||||
int _X_COLD
|
int _X_COLD
|
||||||
SProcXkbDispatch(ClientPtr client)
|
SProcXkbDispatch(ClientPtr client)
|
||||||
{
|
{
|
||||||
@@ -278,7 +265,7 @@ SProcXkbDispatch(ClientPtr client)
|
|||||||
case X_kbSetDeviceInfo:
|
case X_kbSetDeviceInfo:
|
||||||
return SProcXkbSetDeviceInfo(client);
|
return SProcXkbSetDeviceInfo(client);
|
||||||
case X_kbSetDebuggingFlags:
|
case X_kbSetDebuggingFlags:
|
||||||
return SProcXkbSetDebuggingFlags(client);
|
return ProcXkbSetDebuggingFlags(client);
|
||||||
default:
|
default:
|
||||||
return BadRequest;
|
return BadRequest;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user