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 SProcXkbUseExtension()

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 13:55:04 +02:00
committed by Enrico Weigelt
parent 8daa5bc8b9
commit 6cb3338c0b
2 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
xkb/xkb.c
View File

@@ -176,9 +176,15 @@ int
ProcXkbUseExtension(ClientPtr client)
{
REQUEST(xkbUseExtensionReq);
REQUEST_SIZE_MATCH(xkbUseExtensionReq);
if (client->swapped) {
swaps(&stuff->wantedMajor);
swaps(&stuff->wantedMinor);
}
int supported;
REQUEST_SIZE_MATCH(xkbUseExtensionReq);
if (stuff->wantedMajor != SERVER_XKB_MAJOR_VERSION) {
/* pre-release version 0.65 is compatible with 1.00 */
supported = ((SERVER_XKB_MAJOR_VERSION == 1) &&

12
xkb/xkbSwap.c
View File

@@ -41,16 +41,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
/*
* REQUEST SWAPPING
*/
static int _X_COLD
SProcXkbUseExtension(ClientPtr client)
{
REQUEST(xkbUseExtensionReq);
REQUEST_SIZE_MATCH(xkbUseExtensionReq);
swaps(&stuff->wantedMajor);
swaps(&stuff->wantedMinor);
return ProcXkbUseExtension(client);
}
static int _X_COLD
SProcXkbSelectEvents(ClientPtr client)
{
@@ -302,7 +292,7 @@ SProcXkbDispatch(ClientPtr client)
REQUEST(xReq);
switch (stuff->data) {
case X_kbUseExtension:
return SProcXkbUseExtension(client);
return ProcXkbUseExtension(client);
case X_kbSelectEvents:
return SProcXkbSelectEvents(client);
case X_kbBell: