From e3001b71b31b2cf1327fbc86e6403bc3db044409 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Mon, 29 Jul 2024 19:52:46 +0200
Subject: [PATCH] randr: ProcRRListOutputProperties(): use
 SwapShort()/SwapLong()

Simplify reply payload preparation and sendout by using SwapShort()
and SwapLong() instead of WriteToClientSwapped() and callbacks.

This also allows even further simplifications by using generic macros
for the request send path.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1794>
---
 randr/rrproperty.c | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/randr/rrproperty.c b/randr/rrproperty.c
index 122f5ab64..610f5bb8d 100644
--- a/randr/rrproperty.c
+++ b/randr/rrproperty.c
@@ -416,7 +416,6 @@ int
 ProcRRListOutputProperties(ClientPtr client)
 {
     REQUEST(xRRListOutputPropertiesReq);
-    Atom *pAtoms = NULL;
     int numProps = 0;
     RROutputPtr output;
     RRPropertyPtr prop;
@@ -427,9 +426,6 @@ ProcRRListOutputProperties(ClientPtr client)
 
     for (prop = output->properties; prop; prop = prop->next)
         numProps++;
-    if (numProps)
-        if (!(pAtoms = xallocarray(numProps, sizeof(Atom))))
-            return BadAlloc;
 
     xRRListOutputPropertiesReply rep = {
         .type = X_Reply,
@@ -442,18 +438,25 @@ ProcRRListOutputProperties(ClientPtr client)
         swapl(&rep.length);
         swaps(&rep.nAtoms);
     }
-    WriteToClient(client, sizeof(xRRListOutputPropertiesReply), &rep);
 
+    Atom* pAtoms = calloc(sizeof(Atom), numProps);
     if (numProps) {
+        if (!pAtoms)
+            return BadAlloc;
+
         /* Copy property name atoms to reply buffer */
         Atom *temppAtoms = pAtoms;
         for (prop = output->properties; prop; prop = prop->next)
             *temppAtoms++ = prop->propertyName;
 
-        client->pSwapReplyFunc = (ReplySwapPtr) Swap32Write;
-        WriteSwappedDataToClient(client, numProps * sizeof(Atom), pAtoms);
-        free(pAtoms);
+        if (client->swapped)
+            SwapLongs(pAtoms, numProps);
     }
+
+    WriteToClient(client, sizeof(xRRListOutputPropertiesReply), &rep);
+    WriteToClient(client, sizeof(Atom) * numProps, pAtoms);
+    free(pAtoms);
+
     return Success;
 }