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

Xext: shape: 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:50:34 +02:00 committed by Marge Bot
parent cd413baa4b
commit a105c1f7a9
1 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Xext/shape.c
View File

@ -1064,9 +1064,6 @@ SShapeNotifyEvent(xShapeNotifyEvent * from, xShapeNotifyEvent * to)
static int _X_COLD static int _X_COLD
SProcShapeQueryVersion(ClientPtr client) SProcShapeQueryVersion(ClientPtr client)
{ {
REQUEST(xShapeQueryVersionReq);
swaps(&stuff->length);
return ProcShapeQueryVersion(client); return ProcShapeQueryVersion(client);
} }
@ -1074,8 +1071,6 @@ static int _X_COLD
SProcShapeRectangles(ClientPtr client) SProcShapeRectangles(ClientPtr client)
{ {
REQUEST(xShapeRectanglesReq); REQUEST(xShapeRectanglesReq);
swaps(&stuff->length);
REQUEST_AT_LEAST_SIZE(xShapeRectanglesReq); REQUEST_AT_LEAST_SIZE(xShapeRectanglesReq);
swapl(&stuff->dest); swapl(&stuff->dest);
swaps(&stuff->xOff); swaps(&stuff->xOff);
@ -1088,8 +1083,6 @@ static int _X_COLD
SProcShapeMask(ClientPtr client) SProcShapeMask(ClientPtr client)
{ {
REQUEST(xShapeMaskReq); REQUEST(xShapeMaskReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xShapeMaskReq); REQUEST_SIZE_MATCH(xShapeMaskReq);
swapl(&stuff->dest); swapl(&stuff->dest);
swaps(&stuff->xOff); swaps(&stuff->xOff);
@ -1102,8 +1095,6 @@ static int _X_COLD
SProcShapeCombine(ClientPtr client) SProcShapeCombine(ClientPtr client)
{ {
REQUEST(xShapeCombineReq); REQUEST(xShapeCombineReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xShapeCombineReq); REQUEST_SIZE_MATCH(xShapeCombineReq);
swapl(&stuff->dest); swapl(&stuff->dest);
swaps(&stuff->xOff); swaps(&stuff->xOff);
@ -1116,8 +1107,6 @@ static int _X_COLD
SProcShapeOffset(ClientPtr client) SProcShapeOffset(ClientPtr client)
{ {
REQUEST(xShapeOffsetReq); REQUEST(xShapeOffsetReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xShapeOffsetReq); REQUEST_SIZE_MATCH(xShapeOffsetReq);
swapl(&stuff->dest); swapl(&stuff->dest);
swaps(&stuff->xOff); swaps(&stuff->xOff);
@ -1129,8 +1118,6 @@ static int _X_COLD
SProcShapeQueryExtents(ClientPtr client) SProcShapeQueryExtents(ClientPtr client)
{ {
REQUEST(xShapeQueryExtentsReq); REQUEST(xShapeQueryExtentsReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xShapeQueryExtentsReq); REQUEST_SIZE_MATCH(xShapeQueryExtentsReq);
swapl(&stuff->window); swapl(&stuff->window);
return ProcShapeQueryExtents(client); return ProcShapeQueryExtents(client);
@ -1140,8 +1127,6 @@ static int _X_COLD
SProcShapeSelectInput(ClientPtr client) SProcShapeSelectInput(ClientPtr client)
{ {
REQUEST(xShapeSelectInputReq); REQUEST(xShapeSelectInputReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xShapeSelectInputReq); REQUEST_SIZE_MATCH(xShapeSelectInputReq);
swapl(&stuff->window); swapl(&stuff->window);
return ProcShapeSelectInput(client); return ProcShapeSelectInput(client);
@ -1151,8 +1136,6 @@ static int _X_COLD
SProcShapeInputSelected(ClientPtr client) SProcShapeInputSelected(ClientPtr client)
{ {
REQUEST(xShapeInputSelectedReq); REQUEST(xShapeInputSelectedReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xShapeInputSelectedReq); REQUEST_SIZE_MATCH(xShapeInputSelectedReq);
swapl(&stuff->window); swapl(&stuff->window);
return ProcShapeInputSelected(client); return ProcShapeInputSelected(client);
@ -1162,7 +1145,6 @@ static int _X_COLD
SProcShapeGetRectangles(ClientPtr client) SProcShapeGetRectangles(ClientPtr client)
{ {
REQUEST(xShapeGetRectanglesReq); REQUEST(xShapeGetRectanglesReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xShapeGetRectanglesReq); REQUEST_SIZE_MATCH(xShapeGetRectanglesReq);
swapl(&stuff->window); swapl(&stuff->window);
return ProcShapeGetRectangles(client); return ProcShapeGetRectangles(client);