From 73467faeb26b2fb628b7c6980c4573c27e0ee955 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Mon, 29 Jul 2024 20:01:10 +0200 Subject: [PATCH] randr: ProcRRQueryOutputProperty(): 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 Part-of: --- randr/rrproperty.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/randr/rrproperty.c b/randr/rrproperty.c index 610f5bb8d..8df9790f1 100644 --- a/randr/rrproperty.c +++ b/randr/rrproperty.c @@ -495,14 +495,16 @@ ProcRRQueryOutputProperty(ClientPtr client) swaps(&rep.sequenceNumber); swapl(&rep.length); } - WriteToClient(client, sizeof(xRRQueryOutputPropertyReply), &rep); if (prop->num_valid) { memcpy(extra, prop->valid_values, prop->num_valid * sizeof(INT32)); - client->pSwapReplyFunc = (ReplySwapPtr) Swap32Write; - WriteSwappedDataToClient(client, prop->num_valid * sizeof(INT32), - extra); - free(extra); + if (client->swapped) + SwapLongs((CARD32*)extra, prop->num_valid); } + + WriteToClient(client, sizeof(xRRQueryOutputPropertyReply), &rep); + WriteToClient(client, prop->num_valid * sizeof(INT32), extra); + free(extra); + return Success; }