From 26b0ad79edae5f214234d271e4ffcb5ca1768a1c Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Tue, 15 Jul 2025 04:57:48 +0200
Subject: [PATCH] xv: inline SWriteAttributeInfo()

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

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

diff --git a/Xext/xvdisp.c b/Xext/xvdisp.c
index b9aadff68..0d4081a98 100644
--- a/Xext/xvdisp.c
+++ b/Xext/xvdisp.c
@@ -54,18 +54,6 @@ SOFTWARE.
 unsigned long XvXRTPort;
 #endif /* XINERAMA */
 
-static int
-SWriteAttributeInfo(ClientPtr client, xvAttributeInfo * pAtt)
-{
-    swapl(&pAtt->flags);
-    swapl(&pAtt->size);
-    swapl(&pAtt->min);
-    swapl(&pAtt->max);
-    WriteToClient(client, sz_xvAttributeInfo, pAtt);
-
-    return Success;
-}
-
 static int
 SWriteImageFormatInfo(ClientPtr client, xvImageFormatInfo * pImage)
 {
@@ -166,10 +154,6 @@ SWriteListImageFormatsReply(ClientPtr client, xvListImageFormatsReply * rep)
     return Success;
 }
 
-#define _WriteAttributeInfo(_c,_d) \
-  if ((_c)->swapped) SWriteAttributeInfo(_c, _d); \
-  else WriteToClient(_c, sz_xvAttributeInfo, _d)
-
 #define _WriteGrabPortReply(_c,_d) \
   if ((_c)->swapped) SWriteGrabPortReply(_c, _d); \
   else WriteToClient(_c, sz_xvGrabPortReply, _d)
@@ -741,7 +725,6 @@ ProcXvQueryPortAttributes(ClientPtr client)
     int size, i;
     XvPortPtr pPort;
     XvAttributePtr pAtt;
-    xvAttributeInfo Info;
 
     REQUEST(xvQueryPortAttributesReq);
     REQUEST_SIZE_MATCH(xvQueryPortAttributesReq);
@@ -768,13 +751,21 @@ ProcXvQueryPortAttributes(ClientPtr client)
     for (i = 0, pAtt = pPort->pAdaptor->pAttributes;
          i < pPort->pAdaptor->nAttributes; i++, pAtt++) {
         size = strlen(pAtt->name) + 1;  /* pass the NULL */
-        Info.flags = pAtt->flags;
-        Info.min = pAtt->min_value;
-        Info.max = pAtt->max_value;
-        Info.size = pad_to_int32(size);
+        xvAttributeInfo Info = {
+            .flags = pAtt->flags,
+            .min = pAtt->min_value,
+            .max = pAtt->max_value,
+            .size = pad_to_int32(size)
+        };
 
-        _WriteAttributeInfo(client, &Info);
+        if (client->swapped) {
+            swapl(&Info.flags);
+            swapl(&Info.size);
+            swapl(&Info.min);
+            swapl(&Info.max);
+        }
 
+        WriteToClient(client, sz_xvAttributeInfo, &Info);
         WriteToClient(client, size, pAtt->name);
     }