From 3f2cad47a8ac54bd968dae97940c7d9a24fb1cfe Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Tue, 6 Aug 2024 15:21:12 +0200
Subject: [PATCH] (!1639) Xext: xv: drop swapping request length fields

The request struct's length fields aren't used anymore - we have the
client->req_len field instead, which also is bigreq-compatible.

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

diff --git a/Xext/xvdisp.c b/Xext/xvdisp.c
index 64a5a1bf6..d18a0ca4d 100644
--- a/Xext/xvdisp.c
+++ b/Xext/xvdisp.c
@@ -1120,9 +1120,6 @@ ProcXvDispatch(ClientPtr client)
 static int _X_COLD
 SProcXvQueryExtension(ClientPtr client)
 {
-    REQUEST(xvQueryExtensionReq);
-    REQUEST_SIZE_MATCH(xvQueryExtensionReq);
-    swaps(&stuff->length);
     return XvProcVector[xv_QueryExtension] (client);
 }
 
@@ -1131,7 +1128,6 @@ SProcXvQueryAdaptors(ClientPtr client)
 {
     REQUEST(xvQueryAdaptorsReq);
     REQUEST_SIZE_MATCH(xvQueryAdaptorsReq);
-    swaps(&stuff->length);
     swapl(&stuff->window);
     return XvProcVector[xv_QueryAdaptors] (client);
 }
@@ -1141,7 +1137,6 @@ SProcXvQueryEncodings(ClientPtr client)
 {
     REQUEST(xvQueryEncodingsReq);
     REQUEST_SIZE_MATCH(xvQueryEncodingsReq);
-    swaps(&stuff->length);
     swapl(&stuff->port);
     return XvProcVector[xv_QueryEncodings] (client);
 }
@@ -1151,7 +1146,6 @@ SProcXvGrabPort(ClientPtr client)
 {
     REQUEST(xvGrabPortReq);
     REQUEST_SIZE_MATCH(xvGrabPortReq);
-    swaps(&stuff->length);
     swapl(&stuff->port);
     swapl(&stuff->time);
     return XvProcVector[xv_GrabPort] (client);
@@ -1162,7 +1156,6 @@ SProcXvUngrabPort(ClientPtr client)
 {
     REQUEST(xvUngrabPortReq);
     REQUEST_SIZE_MATCH(xvUngrabPortReq);
-    swaps(&stuff->length);
     swapl(&stuff->port);
     swapl(&stuff->time);
     return XvProcVector[xv_UngrabPort] (client);
@@ -1173,7 +1166,6 @@ SProcXvPutVideo(ClientPtr client)
 {
     REQUEST(xvPutVideoReq);
     REQUEST_SIZE_MATCH(xvPutVideoReq);
-    swaps(&stuff->length);
     swapl(&stuff->port);
     swapl(&stuff->drawable);
     swapl(&stuff->gc);
@@ -1193,7 +1185,6 @@ SProcXvPutStill(ClientPtr client)
 {
     REQUEST(xvPutStillReq);
     REQUEST_SIZE_MATCH(xvPutStillReq);
-    swaps(&stuff->length);
     swapl(&stuff->port);
     swapl(&stuff->drawable);
     swapl(&stuff->gc);
@@ -1213,7 +1204,6 @@ SProcXvGetVideo(ClientPtr client)
 {
     REQUEST(xvGetVideoReq);
     REQUEST_SIZE_MATCH(xvGetVideoReq);
-    swaps(&stuff->length);
     swapl(&stuff->port);
     swapl(&stuff->drawable);
     swapl(&stuff->gc);
@@ -1233,7 +1223,6 @@ SProcXvGetStill(ClientPtr client)
 {
     REQUEST(xvGetStillReq);
     REQUEST_SIZE_MATCH(xvGetStillReq);
-    swaps(&stuff->length);
     swapl(&stuff->port);
     swapl(&stuff->drawable);
     swapl(&stuff->gc);
@@ -1253,7 +1242,6 @@ SProcXvPutImage(ClientPtr client)
 {
     REQUEST(xvPutImageReq);
     REQUEST_AT_LEAST_SIZE(xvPutImageReq);
-    swaps(&stuff->length);
     swapl(&stuff->port);
     swapl(&stuff->drawable);
     swapl(&stuff->gc);
@@ -1277,7 +1265,6 @@ SProcXvShmPutImage(ClientPtr client)
 {
     REQUEST(xvShmPutImageReq);
     REQUEST_SIZE_MATCH(xvShmPutImageReq);
-    swaps(&stuff->length);
     swapl(&stuff->port);
     swapl(&stuff->drawable);
     swapl(&stuff->gc);
@@ -1305,7 +1292,6 @@ SProcXvSelectVideoNotify(ClientPtr client)
 {
     REQUEST(xvSelectVideoNotifyReq);
     REQUEST_SIZE_MATCH(xvSelectVideoNotifyReq);
-    swaps(&stuff->length);
     swapl(&stuff->drawable);
     return XvProcVector[xv_SelectVideoNotify] (client);
 }
@@ -1315,7 +1301,6 @@ SProcXvSelectPortNotify(ClientPtr client)
 {
     REQUEST(xvSelectPortNotifyReq);
     REQUEST_SIZE_MATCH(xvSelectPortNotifyReq);
-    swaps(&stuff->length);
     swapl(&stuff->port);
     return XvProcVector[xv_SelectPortNotify] (client);
 }
@@ -1325,7 +1310,6 @@ SProcXvStopVideo(ClientPtr client)
 {
     REQUEST(xvStopVideoReq);
     REQUEST_SIZE_MATCH(xvStopVideoReq);
-    swaps(&stuff->length);
     swapl(&stuff->port);
     swapl(&stuff->drawable);
     return XvProcVector[xv_StopVideo] (client);
@@ -1336,7 +1320,6 @@ SProcXvSetPortAttribute(ClientPtr client)
 {
     REQUEST(xvSetPortAttributeReq);
     REQUEST_SIZE_MATCH(xvSetPortAttributeReq);
-    swaps(&stuff->length);
     swapl(&stuff->port);
     swapl(&stuff->attribute);
     swapl(&stuff->value);
@@ -1348,7 +1331,6 @@ SProcXvGetPortAttribute(ClientPtr client)
 {
     REQUEST(xvGetPortAttributeReq);
     REQUEST_SIZE_MATCH(xvGetPortAttributeReq);
-    swaps(&stuff->length);
     swapl(&stuff->port);
     swapl(&stuff->attribute);
     return XvProcVector[xv_GetPortAttribute] (client);
@@ -1359,7 +1341,6 @@ SProcXvQueryBestSize(ClientPtr client)
 {
     REQUEST(xvQueryBestSizeReq);
     REQUEST_SIZE_MATCH(xvQueryBestSizeReq);
-    swaps(&stuff->length);
     swapl(&stuff->port);
     swaps(&stuff->vid_w);
     swaps(&stuff->vid_h);
@@ -1373,7 +1354,6 @@ SProcXvQueryPortAttributes(ClientPtr client)
 {
     REQUEST(xvQueryPortAttributesReq);
     REQUEST_SIZE_MATCH(xvQueryPortAttributesReq);
-    swaps(&stuff->length);
     swapl(&stuff->port);
     return XvProcVector[xv_QueryPortAttributes] (client);
 }
@@ -1383,7 +1363,6 @@ SProcXvQueryImageAttributes(ClientPtr client)
 {
     REQUEST(xvQueryImageAttributesReq);
     REQUEST_SIZE_MATCH(xvQueryImageAttributesReq);
-    swaps(&stuff->length);
     swapl(&stuff->port);
     swapl(&stuff->id);
     swaps(&stuff->width);
@@ -1396,7 +1375,6 @@ SProcXvListImageFormats(ClientPtr client)
 {
     REQUEST(xvListImageFormatsReq);
     REQUEST_SIZE_MATCH(xvListImageFormatsReq);
-    swaps(&stuff->length);
     swapl(&stuff->port);
     return XvProcVector[xv_ListImageFormats] (client);
 }