(submit/fixup-req-len) 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>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-08-07 13:50:34 +02:00
parent 3bedfc2b9e
commit 8b2dd8c22c

View File

@ -1066,9 +1066,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);
} }
@ -1076,8 +1073,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);
@ -1090,8 +1085,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);
@ -1104,8 +1097,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);
@ -1118,8 +1109,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);
@ -1131,8 +1120,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);
@ -1142,8 +1129,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);
@ -1153,8 +1138,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);
@ -1164,7 +1147,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);