From 75544f1f5889b20cf565a699785238180737d0b2 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Wed, 7 Aug 2024 13:52:18 +0200
Subject: [PATCH] Xext: shm: 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>
---
 Xext/shm.c | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/Xext/shm.c b/Xext/shm.c
index bbdaeccca..6c0c68b5a 100644
--- a/Xext/shm.c
+++ b/Xext/shm.c
@@ -1389,9 +1389,6 @@ SShmCompletionEvent(xShmCompletionEvent * from, xShmCompletionEvent * to)
 static int _X_COLD
 SProcShmQueryVersion(ClientPtr client)
 {
-    REQUEST(xShmQueryVersionReq);
-
-    swaps(&stuff->length);
     return ProcShmQueryVersion(client);
 }
 
@@ -1399,7 +1396,6 @@ static int _X_COLD
 SProcShmAttach(ClientPtr client)
 {
     REQUEST(xShmAttachReq);
-    swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xShmAttachReq);
     swapl(&stuff->shmseg);
     swapl(&stuff->shmid);
@@ -1410,7 +1406,6 @@ static int _X_COLD
 SProcShmDetach(ClientPtr client)
 {
     REQUEST(xShmDetachReq);
-    swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xShmDetachReq);
     swapl(&stuff->shmseg);
     return ProcShmDetach(client);
@@ -1420,7 +1415,6 @@ static int _X_COLD
 SProcShmPutImage(ClientPtr client)
 {
     REQUEST(xShmPutImageReq);
-    swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xShmPutImageReq);
     swapl(&stuff->drawable);
     swapl(&stuff->gc);
@@ -1441,7 +1435,6 @@ static int _X_COLD
 SProcShmGetImage(ClientPtr client)
 {
     REQUEST(xShmGetImageReq);
-    swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xShmGetImageReq);
     swapl(&stuff->drawable);
     swaps(&stuff->x);
@@ -1458,7 +1451,6 @@ static int _X_COLD
 SProcShmCreatePixmap(ClientPtr client)
 {
     REQUEST(xShmCreatePixmapReq);
-    swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xShmCreatePixmapReq);
     swapl(&stuff->pid);
     swapl(&stuff->drawable);
@@ -1475,7 +1467,6 @@ SProcShmAttachFd(ClientPtr client)
 {
     REQUEST(xShmAttachFdReq);
     SetReqFds(client, 1);
-    swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xShmAttachFdReq);
     swapl(&stuff->shmseg);
     return ProcShmAttachFd(client);
@@ -1485,7 +1476,6 @@ static int _X_COLD
 SProcShmCreateSegment(ClientPtr client)
 {
     REQUEST(xShmCreateSegmentReq);
-    swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xShmCreateSegmentReq);
     swapl(&stuff->shmseg);
     swapl(&stuff->size);