mirror of
https://github.com/X11Libre/xserver.git
synced 2026-03-24 03:44:06 +00:00
xkb: inline SProcXkbGetNamedIndicator()
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
68e134de44
commit
3d787e4c48
13
xkb/xkb.c
13
xkb/xkb.c
@@ -3262,14 +3262,21 @@ ProcXkbSetIndicatorMap(ClientPtr client)
|
||||
int
|
||||
ProcXkbGetNamedIndicator(ClientPtr client)
|
||||
{
|
||||
REQUEST(xkbGetNamedIndicatorReq);
|
||||
REQUEST_SIZE_MATCH(xkbGetNamedIndicatorReq);
|
||||
|
||||
if (client->swapped) {
|
||||
swaps(&stuff->deviceSpec);
|
||||
swaps(&stuff->ledClass);
|
||||
swaps(&stuff->ledID);
|
||||
swapl(&stuff->indicator);
|
||||
}
|
||||
|
||||
DeviceIntPtr dev;
|
||||
register int i = 0;
|
||||
XkbSrvLedInfoPtr sli;
|
||||
XkbIndicatorMapPtr map = NULL;
|
||||
|
||||
REQUEST(xkbGetNamedIndicatorReq);
|
||||
REQUEST_SIZE_MATCH(xkbGetNamedIndicatorReq);
|
||||
|
||||
if (!(client->xkbClientFlags & _XkbClientInitialized))
|
||||
return BadAccess;
|
||||
|
||||
|
||||
@@ -268,18 +268,6 @@ SProcXkbSetIndicatorMap(ClientPtr client)
|
||||
return ProcXkbSetIndicatorMap(client);
|
||||
}
|
||||
|
||||
static int _X_COLD
|
||||
SProcXkbGetNamedIndicator(ClientPtr client)
|
||||
{
|
||||
REQUEST(xkbGetNamedIndicatorReq);
|
||||
REQUEST_SIZE_MATCH(xkbGetNamedIndicatorReq);
|
||||
swaps(&stuff->deviceSpec);
|
||||
swaps(&stuff->ledClass);
|
||||
swaps(&stuff->ledID);
|
||||
swapl(&stuff->indicator);
|
||||
return ProcXkbGetNamedIndicator(client);
|
||||
}
|
||||
|
||||
static int _X_COLD
|
||||
SProcXkbSetNamedIndicator(ClientPtr client)
|
||||
{
|
||||
@@ -387,7 +375,7 @@ SProcXkbDispatch(ClientPtr client)
|
||||
case X_kbSetIndicatorMap:
|
||||
return SProcXkbSetIndicatorMap(client);
|
||||
case X_kbGetNamedIndicator:
|
||||
return SProcXkbGetNamedIndicator(client);
|
||||
return ProcXkbGetNamedIndicator(client);
|
||||
case X_kbSetNamedIndicator:
|
||||
return SProcXkbSetNamedIndicator(client);
|
||||
case X_kbGetNames:
|
||||
|
||||
Reference in New Issue
Block a user