From c744d17e69f3eaea843f8e5dafd6f53ecda8d976 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Tue, 15 Jul 2025 05:13:55 +0200 Subject: [PATCH] xv: inline SWriteGetPortAttributeReply() Instead of complex macro machinery, just move the conditional swapping directly into ProcXvGetPortAttribute(). Signed-off-by: Enrico Weigelt, metux IT consult --- Xext/xvdisp.c | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/Xext/xvdisp.c b/Xext/xvdisp.c index d3bc4dd3e5..0069530ca5 100644 --- a/Xext/xvdisp.c +++ b/Xext/xvdisp.c @@ -54,18 +54,6 @@ SOFTWARE. unsigned long XvXRTPort; #endif /* XINERAMA */ -static int -SWriteGetPortAttributeReply(ClientPtr client, xvGetPortAttributeReply * rep) -{ - swaps(&rep->sequenceNumber); - swapl(&rep->length); - swapl(&rep->value); - - WriteToClient(client, sz_xvGetPortAttributeReply, rep); - - return Success; -} - static int SWriteQueryBestSizeReply(ClientPtr client, xvQueryBestSizeReply * rep) { @@ -121,10 +109,6 @@ SWriteListImageFormatsReply(ClientPtr client, xvListImageFormatsReply * rep) return Success; } -#define _WriteGetPortAttributeReply(_c,_d) \ - if ((_c)->swapped) SWriteGetPortAttributeReply(_c, _d); \ - else WriteToClient(_c, sz_xvGetPortAttributeReply, _d) - #define _WriteQueryBestSizeReply(_c,_d) \ if ((_c)->swapped) SWriteQueryBestSizeReply(_c, _d); \ else WriteToClient(_c, sz_xvQueryBestSizeReply, _d) @@ -650,8 +634,13 @@ ProcXvGetPortAttribute(ClientPtr client) .value = value }; - _WriteGetPortAttributeReply(client, &rep); + if (client->swapped) { + swaps(&rep.sequenceNumber); + swapl(&rep.length); + swapl(&rep.value); + } + WriteToClient(client, sz_xvGetPortAttributeReply, &rep); return Success; }