From 5330084bd57caac881b4aafcad68ceb488086771 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Wed, 24 Sep 2025 17:23:01 +0200
Subject: [PATCH] xkb: inline SProcXkbSetMap()

No need to have whole extra functions for just a few LoC.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 xkb/xkb.c     | 15 ++++++++++++---
 xkb/xkbSwap.c | 16 +---------------
 2 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/xkb/xkb.c b/xkb/xkb.c
index e0eaa0a7be..24062cab03 100644
--- a/xkb/xkb.c
+++ b/xkb/xkb.c
@@ -2670,13 +2670,22 @@ _XkbSetMap(ClientPtr client, DeviceIntPtr dev, xkbSetMapReq * req, char *values)
 int
 ProcXkbSetMap(ClientPtr client)
 {
+    REQUEST(xkbSetMapReq);
+    REQUEST_AT_LEAST_SIZE(xkbSetMapReq);
+
+    if (client->swapped) {
+        swaps(&stuff->deviceSpec);
+        swaps(&stuff->present);
+        swaps(&stuff->flags);
+        swaps(&stuff->totalSyms);
+        swaps(&stuff->totalActs);
+        swaps(&stuff->virtualMods);
+    }
+
     DeviceIntPtr dev, master;
     char *tmp;
     int rc;
 
-    REQUEST(xkbSetMapReq);
-    REQUEST_AT_LEAST_SIZE(xkbSetMapReq);
-
     if (!(client->xkbClientFlags & _XkbClientInitialized))
         return BadAccess;
 
diff --git a/xkb/xkbSwap.c b/xkb/xkbSwap.c
index 15858632de..589e0956c9 100644
--- a/xkb/xkbSwap.c
+++ b/xkb/xkbSwap.c
@@ -118,20 +118,6 @@ SProcXkbSelectEvents(ClientPtr client)
     return ProcXkbSelectEvents(client);
 }
 
-static int _X_COLD
-SProcXkbSetMap(ClientPtr client)
-{
-    REQUEST(xkbSetMapReq);
-    REQUEST_AT_LEAST_SIZE(xkbSetMapReq);
-    swaps(&stuff->deviceSpec);
-    swaps(&stuff->present);
-    swaps(&stuff->flags);
-    swaps(&stuff->totalSyms);
-    swaps(&stuff->totalActs);
-    swaps(&stuff->virtualMods);
-    return ProcXkbSetMap(client);
-}
-
 static int _X_COLD
 SProcXkbSetCompatMap(ClientPtr client)
 {
@@ -207,7 +193,7 @@ SProcXkbDispatch(ClientPtr client)
     case X_kbGetMap:
         return ProcXkbGetMap(client);
     case X_kbSetMap:
-        return SProcXkbSetMap(client);
+        return ProcXkbSetMap(client);
     case X_kbGetCompatMap:
         return ProcXkbGetCompatMap(client);
     case X_kbSetCompatMap: