From 68e134de446638a5ff8479bacaa529b764138a1f Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Wed, 24 Sep 2025 14:36:46 +0200
Subject: [PATCH] xkb: inline SProcXkbGetNames() and SProcXkbSetNames()

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     | 25 +++++++++++++++++++------
 xkb/xkbSwap.c | 27 ++-------------------------
 2 files changed, 21 insertions(+), 31 deletions(-)

diff --git a/xkb/xkb.c b/xkb/xkb.c
index f3e631eef1..093379e12a 100644
--- a/xkb/xkb.c
+++ b/xkb/xkb.c
@@ -3742,12 +3742,17 @@ XkbAssembleNames(ClientPtr client, XkbDescPtr xkb, xkbGetNamesReply rep, x_rpcbu
 int
 ProcXkbGetNames(ClientPtr client)
 {
-    DeviceIntPtr dev;
-    XkbDescPtr xkb;
-
     REQUEST(xkbGetNamesReq);
     REQUEST_SIZE_MATCH(xkbGetNamesReq);
 
+    if (client->swapped) {
+        swaps(&stuff->deviceSpec);
+        swapl(&stuff->which);
+    }
+
+    DeviceIntPtr dev;
+    XkbDescPtr xkb;
+
     if (!(client->xkbClientFlags & _XkbClientInitialized))
         return BadAccess;
 
@@ -4187,14 +4192,22 @@ _XkbSetNames(ClientPtr client, DeviceIntPtr dev, xkbSetNamesReq * stuff)
 int
 ProcXkbSetNames(ClientPtr client)
 {
+    REQUEST(xkbSetNamesReq);
+    REQUEST_AT_LEAST_SIZE(xkbSetNamesReq);
+
+    if (client->swapped) {
+        swaps(&stuff->deviceSpec);
+        swaps(&stuff->virtualMods);
+        swapl(&stuff->which);
+        swapl(&stuff->indicators);
+        swaps(&stuff->totalKTLevelNames);
+    }
+
     DeviceIntPtr dev;
     CARD32 *tmp;
     Atom bad;
     int rc;
 
-    REQUEST(xkbSetNamesReq);
-    REQUEST_AT_LEAST_SIZE(xkbSetNamesReq);
-
     if (!(client->xkbClientFlags & _XkbClientInitialized))
         return BadAccess;
 
diff --git a/xkb/xkbSwap.c b/xkb/xkbSwap.c
index ddaa88dd9b..7a6c8a8c20 100644
--- a/xkb/xkbSwap.c
+++ b/xkb/xkbSwap.c
@@ -294,29 +294,6 @@ SProcXkbSetNamedIndicator(ClientPtr client)
     return ProcXkbSetNamedIndicator(client);
 }
 
-static int _X_COLD
-SProcXkbGetNames(ClientPtr client)
-{
-    REQUEST(xkbGetNamesReq);
-    REQUEST_SIZE_MATCH(xkbGetNamesReq);
-    swaps(&stuff->deviceSpec);
-    swapl(&stuff->which);
-    return ProcXkbGetNames(client);
-}
-
-static int _X_COLD
-SProcXkbSetNames(ClientPtr client)
-{
-    REQUEST(xkbSetNamesReq);
-    REQUEST_AT_LEAST_SIZE(xkbSetNamesReq);
-    swaps(&stuff->deviceSpec);
-    swaps(&stuff->virtualMods);
-    swapl(&stuff->which);
-    swapl(&stuff->indicators);
-    swaps(&stuff->totalKTLevelNames);
-    return ProcXkbSetNames(client);
-}
-
 static int _X_COLD
 SProcXkbGetGeometry(ClientPtr client)
 {
@@ -414,9 +391,9 @@ SProcXkbDispatch(ClientPtr client)
     case X_kbSetNamedIndicator:
         return SProcXkbSetNamedIndicator(client);
     case X_kbGetNames:
-        return SProcXkbGetNames(client);
+        return ProcXkbGetNames(client);
     case X_kbSetNames:
-        return SProcXkbSetNames(client);
+        return ProcXkbSetNames(client);
     case X_kbGetGeometry:
         return SProcXkbGetGeometry(client);
     case X_kbSetGeometry: