frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-08-07 13:52:18 +02:00 committed by Marge Bot
parent a105c1f7a9
commit 75544f1f58
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Xext/shm.c
View File

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