From a173278c4f247888eb7a98538d7c3f5253b6ab6a Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Tue, 2 Dec 2025 16:59:32 +0100
Subject: [PATCH] dix: make SwapLongs() inline

a) trade a little bit of code size for speed
   (depending on exact caller, compiler might also optimize a lot)
b) reduce the need for exported, but non-public symbol

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 dix/dix_priv.h | 28 ++++++++++++++++++++++++++--
 dix/swapreq.c  | 24 ------------------------
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/dix/dix_priv.h b/dix/dix_priv.h
index d4252ee6ec..c3fbf4580d 100644
--- a/dix/dix_priv.h
+++ b/dix/dix_priv.h
@@ -767,8 +767,32 @@ int dixAllocColor(ClientPtr client, Colormap cmap, CARD16 *red,
 
 void ReplyNotSwappd(ClientPtr pClient, int size, void *pbuf)  _X_NORETURN;
 
-/* needed by some internal modules */ _X_EXPORT
-void SwapLongs(CARD32 *list, unsigned long count);
+/*
+ * Byte swap a list of CARD32s
+ *
+ * @param list    pointer to list of clients
+ * @param count   amount of CARD32s to swap
+ */
+static inline void SwapLongs(CARD32 *list, unsigned long count) {
+    while (count >= 8) {
+        swapl(list + 0);
+        swapl(list + 1);
+        swapl(list + 2);
+        swapl(list + 3);
+        swapl(list + 4);
+        swapl(list + 5);
+        swapl(list + 6);
+        swapl(list + 7);
+        list += 8;
+        count -= 8;
+    }
+    if (count != 0) {
+        do {
+            swapl(list);
+            list++;
+        } while (--count != 0);
+    }
+}
 
 #define SwapRestL(stuff) \
     SwapLongs((CARD32 *)(stuff + 1), (client->req_len - (sizeof(*stuff) >> 2)))
diff --git a/dix/swapreq.c b/dix/swapreq.c
index de9f1399eb..15a6a7c407 100644
--- a/dix/swapreq.c
+++ b/dix/swapreq.c
@@ -60,30 +60,6 @@ SOFTWARE.
 
 /* Thanks to Jack Palevich for testing and subsequently rewriting all this */
 
-/* Byte swap a list of longs */
-void
-SwapLongs(CARD32 *list, unsigned long count)
-{
-    while (count >= 8) {
-        swapl(list + 0);
-        swapl(list + 1);
-        swapl(list + 2);
-        swapl(list + 3);
-        swapl(list + 4);
-        swapl(list + 5);
-        swapl(list + 6);
-        swapl(list + 7);
-        list += 8;
-        count -= 8;
-    }
-    if (count != 0) {
-        do {
-            swapl(list);
-            list++;
-        } while (--count != 0);
-    }
-}
-
 /* Byte swap a list of shorts */
 void
 SwapShorts(short *list, unsigned long count)