Xext: xtest: 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>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1639>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-08-06 15:20:47 +02:00 committed by Marge Bot
parent 8a5d2a1335
commit 69982abf7b

View File

@ -373,7 +373,6 @@ ProcXTestFakeInput(ClientPtr client)
/* swap the request back so we can simply re-execute it */ /* swap the request back so we can simply re-execute it */
if (client->swapped) { if (client->swapped) {
(void) XTestSwapFakeInput(client, (xReq *) stuff); (void) XTestSwapFakeInput(client, (xReq *) stuff);
swaps(&stuff->length);
} }
ResetCurrentRequest(client); ResetCurrentRequest(client);
client->sequence--; client->sequence--;
@ -487,8 +486,6 @@ static int _X_COLD
SProcXTestGetVersion(ClientPtr client) SProcXTestGetVersion(ClientPtr client)
{ {
REQUEST(xXTestGetVersionReq); REQUEST(xXTestGetVersionReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xXTestGetVersionReq); REQUEST_SIZE_MATCH(xXTestGetVersionReq);
swaps(&stuff->minorVersion); swaps(&stuff->minorVersion);
return ProcXTestGetVersion(client); return ProcXTestGetVersion(client);
@ -498,8 +495,6 @@ static int _X_COLD
SProcXTestCompareCursor(ClientPtr client) SProcXTestCompareCursor(ClientPtr client)
{ {
REQUEST(xXTestCompareCursorReq); REQUEST(xXTestCompareCursorReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xXTestCompareCursorReq); REQUEST_SIZE_MATCH(xXTestCompareCursorReq);
swapl(&stuff->window); swapl(&stuff->window);
swapl(&stuff->cursor); swapl(&stuff->cursor);
@ -537,7 +532,6 @@ SProcXTestFakeInput(ClientPtr client)
REQUEST(xReq); REQUEST(xReq);
swaps(&stuff->length);
n = XTestSwapFakeInput(client, stuff); n = XTestSwapFakeInput(client, stuff);
if (n != Success) if (n != Success)
return n; return n;
@ -547,10 +541,6 @@ SProcXTestFakeInput(ClientPtr client)
static int _X_COLD static int _X_COLD
SProcXTestGrabControl(ClientPtr client) SProcXTestGrabControl(ClientPtr client)
{ {
REQUEST(xXTestGrabControlReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xXTestGrabControlReq);
return ProcXTestGrabControl(client); return ProcXTestGrabControl(client);
} }