(!1639) 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>
This commit is contained in:
parent
57d8528ce5
commit
2c8620a4ee
10
Xext/shm.c
10
Xext/shm.c
|
@ -1391,9 +1391,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);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1401,7 +1398,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);
|
||||||
|
@ -1412,7 +1408,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);
|
||||||
|
@ -1422,7 +1417,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);
|
||||||
|
@ -1443,7 +1437,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);
|
||||||
|
@ -1460,7 +1453,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);
|
||||||
|
@ -1477,7 +1469,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);
|
||||||
|
@ -1487,7 +1478,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);
|
||||||
|
|
Loading…
Reference in New Issue