From 9b753c397075dde0855e279252e4d8db29dc2e55 Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed, 11 Jun 2025 13:43:00 -0700
Subject: [PATCH] Revert "randr: ProcRRGetMonitors() use SwapLongs instead of
 callbacks"

This reverts commit 203f59c6d3a47b0cf4be6cff7ca9ef99c9933f00.

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2012>
---
 randr/rrmonitor.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/randr/rrmonitor.c b/randr/rrmonitor.c
index db33d117c..c77978e33 100644
--- a/randr/rrmonitor.c
+++ b/randr/rrmonitor.c
@@ -622,6 +622,8 @@ ProcRRGetMonitors(ClientPtr client)
     }
     WriteToClient(client, sizeof(xRRGetMonitorsReply), &rep);
 
+    client->pSwapReplyFunc = (ReplySwapPtr) CopySwap32Write;
+
     for (m = 0; m < nmonitors; m++) {
         RRMonitorPtr    monitor = &monitors[m];
         xRRMonitorInfo  info = {
@@ -647,14 +649,8 @@ ProcRRGetMonitors(ClientPtr client)
             swapl(&info.heightInMillimeters);
         }
 
-        RROutput outputs[monitor->numOutputs];
-        memcpy(outputs, monitor->outputs, monitor->numOutputs * sizeof (RROutput));
-
-        if (client->swapped)
-            SwapLongs(outputs, monitor->numOutputs);
-
         WriteToClient(client, sizeof(xRRMonitorInfo), &info);
-        WriteToClient(client, sizeof(outputs), outputs);
+        WriteSwappedDataToClient(client, monitor->numOutputs * sizeof (RROutput), monitor->outputs);
     }
 
     RRMonitorFreeList(monitors, nmonitors);