From 0f0164882f98da4878b1d33d60e3a62cd04febb0 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Wed, 17 Sep 2025 12:18:12 +0200
Subject: [PATCH] Xi: inline SProcXGetExtensionVersion()

No need to have a hole bunch of extra functions, if we can just easily
inline the few relevant lines.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 Xi/extinit.c  |  2 +-
 Xi/getvers.c  | 18 +++---------------
 Xi/handlers.h |  1 -
 3 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/Xi/extinit.c b/Xi/extinit.c
index 715901436e..ff4b9343a1 100644
--- a/Xi/extinit.c
+++ b/Xi/extinit.c
@@ -352,7 +352,7 @@ SProcIDispatch(ClientPtr client)
 
     switch (stuff->data) {
         case X_GetExtensionVersion:
-            return SProcXGetExtensionVersion(client);
+            return ProcXGetExtensionVersion(client);
         case X_ListInputDevices:
             return ProcXListInputDevices(client);
         case X_OpenDevice:
diff --git a/Xi/getvers.c b/Xi/getvers.c
index 7bf47c7e6a..8bb153d7fa 100644
--- a/Xi/getvers.c
+++ b/Xi/getvers.c
@@ -64,21 +64,6 @@ SOFTWARE.
 
 XExtensionVersion XIVersion;
 
-/***********************************************************************
- *
- * Handle a request from a client with a different byte order than us.
- *
- */
-
-int _X_COLD
-SProcXGetExtensionVersion(ClientPtr client)
-{
-    REQUEST(xGetExtensionVersionReq);
-    REQUEST_AT_LEAST_SIZE(xGetExtensionVersionReq);
-    swaps(&stuff->nbytes);
-    return (ProcXGetExtensionVersion(client));
-}
-
 /***********************************************************************
  *
  * This procedure returns the major/minor version of the X Input extension.
@@ -91,6 +76,9 @@ ProcXGetExtensionVersion(ClientPtr client)
     REQUEST(xGetExtensionVersionReq);
     REQUEST_AT_LEAST_SIZE(xGetExtensionVersionReq);
 
+    if (client->swapped)
+        swaps(&stuff->nbytes);
+
     if (client->req_len != bytes_to_int32(sizeof(xGetExtensionVersionReq) +
                                         stuff->nbytes))
         return BadLength;
diff --git a/Xi/handlers.h b/Xi/handlers.h
index 053455daf1..96211ea820 100644
--- a/Xi/handlers.h
+++ b/Xi/handlers.h
@@ -70,7 +70,6 @@ int ProcXUngrabDevice(ClientPtr client);
 int ProcXUngrabDeviceKey(ClientPtr client);
 
 int SProcXGetDeviceMotionEvents(ClientPtr client);
-int SProcXGetExtensionVersion(ClientPtr client);
 int SProcXIAllowEvents(ClientPtr client);
 int SProcXIBarrierReleasePointer(ClientPtr client);
 int SProcXIGetClientPointer(ClientPtr client);