From 73ca100659b48a2c01f40de179f7f57ce736defb Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Tue, 15 Jul 2025 04:27:23 +0200
Subject: [PATCH] xv: inline SWriteAdaptorInfo()

Instead of complex macro machinery, just move the conditional swapping
directly into ProcXvQueryAdaptors().

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 Xext/xvdisp.c | 39 ++++++++++++++-------------------------
 1 file changed, 14 insertions(+), 25 deletions(-)

diff --git a/Xext/xvdisp.c b/Xext/xvdisp.c
index 9c4fcf4263..e5ebdc0926 100644
--- a/Xext/xvdisp.c
+++ b/Xext/xvdisp.c
@@ -54,19 +54,6 @@ SOFTWARE.
 unsigned long XvXRTPort;
 #endif /* XINERAMA */
 
-static int
-SWriteAdaptorInfo(ClientPtr client, xvAdaptorInfo * pAdaptor)
-{
-    swapl(&pAdaptor->base_id);
-    swaps(&pAdaptor->name_size);
-    swaps(&pAdaptor->num_ports);
-    swaps(&pAdaptor->num_formats);
-
-    WriteToClient(client, sz_xvAdaptorInfo, pAdaptor);
-
-    return Success;
-}
-
 static int
 SWriteEncodingInfo(ClientPtr client, xvEncodingInfo * pEncoding)
 {
@@ -203,10 +190,6 @@ SWriteListImageFormatsReply(ClientPtr client, xvListImageFormatsReply * rep)
     return Success;
 }
 
-#define _WriteAdaptorInfo(_c,_d) \
-  if ((_c)->swapped) SWriteAdaptorInfo(_c, _d); \
-  else WriteToClient(_c, sz_xvAdaptorInfo, _d)
-
 #define _WriteAttributeInfo(_c,_d) \
   if ((_c)->swapped) SWriteAttributeInfo(_c, _d); \
   else WriteToClient(_c, sz_xvAttributeInfo, _d)
@@ -276,7 +259,6 @@ static int
 ProcXvQueryAdaptors(ClientPtr client)
 {
     xvFormat format;
-    xvAdaptorInfo ainfo;
     int totalSize, na, nf, rc;
     int nameSize;
     XvAdaptorPtr pa;
@@ -334,15 +316,22 @@ ProcXvQueryAdaptors(ClientPtr client)
     na = pxvs->nAdaptors;
     pa = pxvs->pAdaptors;
     while (na--) {
+        xvAdaptorInfo ainfo = {
+            ainfo.base_id = pa->base_id,
+            ainfo.num_ports = pa->nPorts,
+            ainfo.type = pa->type,
+            ainfo.name_size = nameSize = strlen(pa->name),
+            ainfo.num_formats = pa->nFormats,
+        };
 
-        ainfo.base_id = pa->base_id;
-        ainfo.num_ports = pa->nPorts;
-        ainfo.type = pa->type;
-        ainfo.name_size = nameSize = strlen(pa->name);
-        ainfo.num_formats = pa->nFormats;
-
-        _WriteAdaptorInfo(client, &ainfo);
+        if (client->swapped) {
+            swapl(&ainfo.base_id);
+            swaps(&ainfo.name_size);
+            swaps(&ainfo.num_ports);
+            swaps(&ainfo.num_formats);
+        }
 
+        WriteToClient(client, sz_xvAdaptorInfo, &ainfo);
         WriteToClient(client, nameSize, pa->name);
 
         nf = pa->nFormats;