From 6cb3338c0b2037bf0e5cb8556280e99962161c8d Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Wed, 24 Sep 2025 13:55:04 +0200
Subject: [PATCH] xkb: inline SProcXkbUseExtension()

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     |  8 +++++++-
 xkb/xkbSwap.c | 12 +-----------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/xkb/xkb.c b/xkb/xkb.c
index f5e6cd6a2c..cf082b02a7 100644
--- a/xkb/xkb.c
+++ b/xkb/xkb.c
@@ -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) &&
diff --git a/xkb/xkbSwap.c b/xkb/xkbSwap.c
index 7ca180f5ba..7491de106c 100644
--- a/xkb/xkbSwap.c
+++ b/xkb/xkbSwap.c
@@ -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: