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

xfixes: 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-06 14:34:17 +02:00 committed by Marge Bot
parent 9af095e121
commit eea9e4e84b
6 changed files with 0 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
xfixes/cursor.c
View File

@ -300,8 +300,6 @@ SProcXFixesSelectCursorInput(ClientPtr client)
{ {
REQUEST(xXFixesSelectCursorInputReq); REQUEST(xXFixesSelectCursorInputReq);
REQUEST_SIZE_MATCH(xXFixesSelectCursorInputReq); REQUEST_SIZE_MATCH(xXFixesSelectCursorInputReq);
swaps(&stuff->length);
swapl(&stuff->window); swapl(&stuff->window);
swapl(&stuff->eventMask); swapl(&stuff->eventMask);
return (*ProcXFixesVector[stuff->xfixesReqType]) (client); return (*ProcXFixesVector[stuff->xfixesReqType]) (client);
@ -420,7 +418,6 @@ int _X_COLD
SProcXFixesGetCursorImage(ClientPtr client) SProcXFixesGetCursorImage(ClientPtr client)
{ {
REQUEST(xXFixesGetCursorImageReq); REQUEST(xXFixesGetCursorImageReq);
swaps(&stuff->length);
return (*ProcXFixesVector[stuff->xfixesReqType]) (client); return (*ProcXFixesVector[stuff->xfixesReqType]) (client);
} }
@ -448,8 +445,6 @@ int _X_COLD
SProcXFixesSetCursorName(ClientPtr client) SProcXFixesSetCursorName(ClientPtr client)
{ {
REQUEST(xXFixesSetCursorNameReq); REQUEST(xXFixesSetCursorNameReq);
swaps(&stuff->length);
REQUEST_AT_LEAST_SIZE(xXFixesSetCursorNameReq); REQUEST_AT_LEAST_SIZE(xXFixesSetCursorNameReq);
swapl(&stuff->cursor); swapl(&stuff->cursor);
swaps(&stuff->nbytes); swaps(&stuff->nbytes);
@ -497,8 +492,6 @@ int _X_COLD
SProcXFixesGetCursorName(ClientPtr client) SProcXFixesGetCursorName(ClientPtr client)
{ {
REQUEST(xXFixesGetCursorNameReq); REQUEST(xXFixesGetCursorNameReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xXFixesGetCursorNameReq); REQUEST_SIZE_MATCH(xXFixesGetCursorNameReq);
swapl(&stuff->cursor); swapl(&stuff->cursor);
return (*ProcXFixesVector[stuff->xfixesReqType]) (client); return (*ProcXFixesVector[stuff->xfixesReqType]) (client);
@ -577,7 +570,6 @@ int _X_COLD
SProcXFixesGetCursorImageAndName(ClientPtr client) SProcXFixesGetCursorImageAndName(ClientPtr client)
{ {
REQUEST(xXFixesGetCursorImageAndNameReq); REQUEST(xXFixesGetCursorImageAndNameReq);
swaps(&stuff->length);
return (*ProcXFixesVector[stuff->xfixesReqType]) (client); return (*ProcXFixesVector[stuff->xfixesReqType]) (client);
} }
@ -704,8 +696,6 @@ int _X_COLD
SProcXFixesChangeCursor(ClientPtr client) SProcXFixesChangeCursor(ClientPtr client)
{ {
REQUEST(xXFixesChangeCursorReq); REQUEST(xXFixesChangeCursorReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xXFixesChangeCursorReq); REQUEST_SIZE_MATCH(xXFixesChangeCursorReq);
swapl(&stuff->source); swapl(&stuff->source);
swapl(&stuff->destination); swapl(&stuff->destination);
@ -743,8 +733,6 @@ int _X_COLD
SProcXFixesChangeCursorByName(ClientPtr client) SProcXFixesChangeCursorByName(ClientPtr client)
{ {
REQUEST(xXFixesChangeCursorByNameReq); REQUEST(xXFixesChangeCursorByNameReq);
swaps(&stuff->length);
REQUEST_AT_LEAST_SIZE(xXFixesChangeCursorByNameReq); REQUEST_AT_LEAST_SIZE(xXFixesChangeCursorByNameReq);
swapl(&stuff->source); swapl(&stuff->source);
swaps(&stuff->nbytes); swaps(&stuff->nbytes);
@ -902,8 +890,6 @@ int _X_COLD
SProcXFixesHideCursor(ClientPtr client) SProcXFixesHideCursor(ClientPtr client)
{ {
REQUEST(xXFixesHideCursorReq); REQUEST(xXFixesHideCursorReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xXFixesHideCursorReq); REQUEST_SIZE_MATCH(xXFixesHideCursorReq);
swapl(&stuff->window); swapl(&stuff->window);
return (*ProcXFixesVector[stuff->xfixesReqType]) (client); return (*ProcXFixesVector[stuff->xfixesReqType]) (client);
@ -952,8 +938,6 @@ int _X_COLD
SProcXFixesShowCursor(ClientPtr client) SProcXFixesShowCursor(ClientPtr client)
{ {
REQUEST(xXFixesShowCursorReq); REQUEST(xXFixesShowCursorReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xXFixesShowCursorReq); REQUEST_SIZE_MATCH(xXFixesShowCursorReq);
swapl(&stuff->window); swapl(&stuff->window);
return (*ProcXFixesVector[stuff->xfixesReqType]) (client); return (*ProcXFixesVector[stuff->xfixesReqType]) (client);
@ -1027,7 +1011,6 @@ SProcXFixesCreatePointerBarrier(ClientPtr client)
REQUEST_AT_LEAST_SIZE(xXFixesCreatePointerBarrierReq); REQUEST_AT_LEAST_SIZE(xXFixesCreatePointerBarrierReq);
swaps(&stuff->length);
swaps(&stuff->num_devices); swaps(&stuff->num_devices);
REQUEST_FIXED_SIZE(xXFixesCreatePointerBarrierReq, REQUEST_FIXED_SIZE(xXFixesCreatePointerBarrierReq,
pad_to_int32(stuff->num_devices * sizeof(CARD16))); pad_to_int32(stuff->num_devices * sizeof(CARD16)));
@ -1060,8 +1043,6 @@ int _X_COLD
SProcXFixesDestroyPointerBarrier(ClientPtr client) SProcXFixesDestroyPointerBarrier(ClientPtr client)
{ {
REQUEST(xXFixesDestroyPointerBarrierReq); REQUEST(xXFixesDestroyPointerBarrierReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xXFixesDestroyPointerBarrierReq); REQUEST_SIZE_MATCH(xXFixesDestroyPointerBarrierReq);
swapl(&stuff->barrier); swapl(&stuff->barrier);
return ProcXFixesVector[stuff->xfixesReqType] (client); return ProcXFixesVector[stuff->xfixesReqType] (client);

6
xfixes/disconnect.c
View File

@ -76,9 +76,6 @@ int _X_COLD
SProcXFixesSetClientDisconnectMode(ClientPtr client) SProcXFixesSetClientDisconnectMode(ClientPtr client)
{ {
REQUEST(xXFixesSetClientDisconnectModeReq); REQUEST(xXFixesSetClientDisconnectModeReq);
swaps(&stuff->length);
REQUEST_AT_LEAST_SIZE(xXFixesSetClientDisconnectModeReq); REQUEST_AT_LEAST_SIZE(xXFixesSetClientDisconnectModeReq);
swapl(&stuff->disconnect_mode); swapl(&stuff->disconnect_mode);
@ -113,9 +110,6 @@ int _X_COLD
SProcXFixesGetClientDisconnectMode(ClientPtr client) SProcXFixesGetClientDisconnectMode(ClientPtr client)
{ {
REQUEST(xXFixesGetClientDisconnectModeReq); REQUEST(xXFixesGetClientDisconnectModeReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xXFixesGetClientDisconnectModeReq); REQUEST_SIZE_MATCH(xXFixesGetClientDisconnectModeReq);
return (*ProcXFixesVector[stuff->xfixesReqType]) (client); return (*ProcXFixesVector[stuff->xfixesReqType]) (client);

34
xfixes/region.c
View File

@ -95,8 +95,6 @@ int _X_COLD
SProcXFixesCreateRegion(ClientPtr client) SProcXFixesCreateRegion(ClientPtr client)
{ {
REQUEST(xXFixesCreateRegionReq); REQUEST(xXFixesCreateRegionReq);
swaps(&stuff->length);
REQUEST_AT_LEAST_SIZE(xXFixesCreateRegionReq); REQUEST_AT_LEAST_SIZE(xXFixesCreateRegionReq);
swapl(&stuff->region); swapl(&stuff->region);
SwapRestS(stuff); SwapRestS(stuff);
@ -139,8 +137,6 @@ int _X_COLD
SProcXFixesCreateRegionFromBitmap(ClientPtr client) SProcXFixesCreateRegionFromBitmap(ClientPtr client)
{ {
REQUEST(xXFixesCreateRegionFromBitmapReq); REQUEST(xXFixesCreateRegionFromBitmapReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xXFixesCreateRegionFromBitmapReq); REQUEST_SIZE_MATCH(xXFixesCreateRegionFromBitmapReq);
swapl(&stuff->region); swapl(&stuff->region);
swapl(&stuff->bitmap); swapl(&stuff->bitmap);
@ -198,8 +194,6 @@ int _X_COLD
SProcXFixesCreateRegionFromWindow(ClientPtr client) SProcXFixesCreateRegionFromWindow(ClientPtr client)
{ {
REQUEST(xXFixesCreateRegionFromWindowReq); REQUEST(xXFixesCreateRegionFromWindowReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xXFixesCreateRegionFromWindowReq); REQUEST_SIZE_MATCH(xXFixesCreateRegionFromWindowReq);
swapl(&stuff->region); swapl(&stuff->region);
swapl(&stuff->window); swapl(&stuff->window);
@ -241,8 +235,6 @@ int _X_COLD
SProcXFixesCreateRegionFromGC(ClientPtr client) SProcXFixesCreateRegionFromGC(ClientPtr client)
{ {
REQUEST(xXFixesCreateRegionFromGCReq); REQUEST(xXFixesCreateRegionFromGCReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xXFixesCreateRegionFromGCReq); REQUEST_SIZE_MATCH(xXFixesCreateRegionFromGCReq);
swapl(&stuff->region); swapl(&stuff->region);
swapl(&stuff->gc); swapl(&stuff->gc);
@ -283,8 +275,6 @@ int _X_COLD
SProcXFixesCreateRegionFromPicture(ClientPtr client) SProcXFixesCreateRegionFromPicture(ClientPtr client)
{ {
REQUEST(xXFixesCreateRegionFromPictureReq); REQUEST(xXFixesCreateRegionFromPictureReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xXFixesCreateRegionFromPictureReq); REQUEST_SIZE_MATCH(xXFixesCreateRegionFromPictureReq);
swapl(&stuff->region); swapl(&stuff->region);
swapl(&stuff->picture); swapl(&stuff->picture);
@ -307,8 +297,6 @@ int _X_COLD
SProcXFixesDestroyRegion(ClientPtr client) SProcXFixesDestroyRegion(ClientPtr client)
{ {
REQUEST(xXFixesDestroyRegionReq); REQUEST(xXFixesDestroyRegionReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xXFixesDestroyRegionReq); REQUEST_SIZE_MATCH(xXFixesDestroyRegionReq);
swapl(&stuff->region); swapl(&stuff->region);
return (*ProcXFixesVector[stuff->xfixesReqType]) (client); return (*ProcXFixesVector[stuff->xfixesReqType]) (client);
@ -345,8 +333,6 @@ int _X_COLD
SProcXFixesSetRegion(ClientPtr client) SProcXFixesSetRegion(ClientPtr client)
{ {
REQUEST(xXFixesSetRegionReq); REQUEST(xXFixesSetRegionReq);
swaps(&stuff->length);
REQUEST_AT_LEAST_SIZE(xXFixesSetRegionReq); REQUEST_AT_LEAST_SIZE(xXFixesSetRegionReq);
swapl(&stuff->region); swapl(&stuff->region);
SwapRestS(stuff); SwapRestS(stuff);
@ -374,8 +360,6 @@ int _X_COLD
SProcXFixesCopyRegion(ClientPtr client) SProcXFixesCopyRegion(ClientPtr client)
{ {
REQUEST(xXFixesCopyRegionReq); REQUEST(xXFixesCopyRegionReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xXFixesCopyRegionReq); REQUEST_SIZE_MATCH(xXFixesCopyRegionReq);
swapl(&stuff->source); swapl(&stuff->source);
swapl(&stuff->destination); swapl(&stuff->destination);
@ -416,8 +400,6 @@ int _X_COLD
SProcXFixesCombineRegion(ClientPtr client) SProcXFixesCombineRegion(ClientPtr client)
{ {
REQUEST(xXFixesCombineRegionReq); REQUEST(xXFixesCombineRegionReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xXFixesCombineRegionReq); REQUEST_SIZE_MATCH(xXFixesCombineRegionReq);
swapl(&stuff->source1); swapl(&stuff->source1);
swapl(&stuff->source2); swapl(&stuff->source2);
@ -460,8 +442,6 @@ int _X_COLD
SProcXFixesInvertRegion(ClientPtr client) SProcXFixesInvertRegion(ClientPtr client)
{ {
REQUEST(xXFixesInvertRegionReq); REQUEST(xXFixesInvertRegionReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xXFixesInvertRegionReq); REQUEST_SIZE_MATCH(xXFixesInvertRegionReq);
swapl(&stuff->source); swapl(&stuff->source);
swaps(&stuff->x); swaps(&stuff->x);
@ -490,8 +470,6 @@ int _X_COLD
SProcXFixesTranslateRegion(ClientPtr client) SProcXFixesTranslateRegion(ClientPtr client)
{ {
REQUEST(xXFixesTranslateRegionReq); REQUEST(xXFixesTranslateRegionReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xXFixesTranslateRegionReq); REQUEST_SIZE_MATCH(xXFixesTranslateRegionReq);
swapl(&stuff->region); swapl(&stuff->region);
swaps(&stuff->dx); swaps(&stuff->dx);
@ -519,8 +497,6 @@ int _X_COLD
SProcXFixesRegionExtents(ClientPtr client) SProcXFixesRegionExtents(ClientPtr client)
{ {
REQUEST(xXFixesRegionExtentsReq); REQUEST(xXFixesRegionExtentsReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xXFixesRegionExtentsReq); REQUEST_SIZE_MATCH(xXFixesRegionExtentsReq);
swapl(&stuff->source); swapl(&stuff->source);
swapl(&stuff->destination); swapl(&stuff->destination);
@ -584,8 +560,6 @@ int _X_COLD
SProcXFixesFetchRegion(ClientPtr client) SProcXFixesFetchRegion(ClientPtr client)
{ {
REQUEST(xXFixesFetchRegionReq); REQUEST(xXFixesFetchRegionReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xXFixesFetchRegionReq); REQUEST_SIZE_MATCH(xXFixesFetchRegionReq);
swapl(&stuff->region); swapl(&stuff->region);
return (*ProcXFixesVector[stuff->xfixesReqType]) (client); return (*ProcXFixesVector[stuff->xfixesReqType]) (client);
@ -627,8 +601,6 @@ int _X_COLD
SProcXFixesSetGCClipRegion(ClientPtr client) SProcXFixesSetGCClipRegion(ClientPtr client)
{ {
REQUEST(xXFixesSetGCClipRegionReq); REQUEST(xXFixesSetGCClipRegionReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xXFixesSetGCClipRegionReq); REQUEST_SIZE_MATCH(xXFixesSetGCClipRegionReq);
swapl(&stuff->gc); swapl(&stuff->gc);
swapl(&stuff->region); swapl(&stuff->region);
@ -717,8 +689,6 @@ int _X_COLD
SProcXFixesSetWindowShapeRegion(ClientPtr client) SProcXFixesSetWindowShapeRegion(ClientPtr client)
{ {
REQUEST(xXFixesSetWindowShapeRegionReq); REQUEST(xXFixesSetWindowShapeRegionReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xXFixesSetWindowShapeRegionReq); REQUEST_SIZE_MATCH(xXFixesSetWindowShapeRegionReq);
swapl(&stuff->dest); swapl(&stuff->dest);
swaps(&stuff->xOff); swaps(&stuff->xOff);
@ -750,8 +720,6 @@ int _X_COLD
SProcXFixesSetPictureClipRegion(ClientPtr client) SProcXFixesSetPictureClipRegion(ClientPtr client)
{ {
REQUEST(xXFixesSetPictureClipRegionReq); REQUEST(xXFixesSetPictureClipRegionReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xXFixesSetPictureClipRegionReq); REQUEST_SIZE_MATCH(xXFixesSetPictureClipRegionReq);
swapl(&stuff->picture); swapl(&stuff->picture);
swapl(&stuff->region); swapl(&stuff->region);
@ -803,8 +771,6 @@ int _X_COLD
SProcXFixesExpandRegion(ClientPtr client) SProcXFixesExpandRegion(ClientPtr client)
{ {
REQUEST(xXFixesExpandRegionReq); REQUEST(xXFixesExpandRegionReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xXFixesExpandRegionReq); REQUEST_SIZE_MATCH(xXFixesExpandRegionReq);
swapl(&stuff->source); swapl(&stuff->source);
swapl(&stuff->destination); swapl(&stuff->destination);

1
xfixes/saveset.c
View File

@ -64,7 +64,6 @@ SProcXFixesChangeSaveSet(ClientPtr client)
REQUEST(xXFixesChangeSaveSetReq); REQUEST(xXFixesChangeSaveSetReq);
REQUEST_SIZE_MATCH(xXFixesChangeSaveSetReq); REQUEST_SIZE_MATCH(xXFixesChangeSaveSetReq);
swaps(&stuff->length);
swapl(&stuff->window); swapl(&stuff->window);
return (*ProcXFixesVector[stuff->xfixesReqType]) (client); return (*ProcXFixesVector[stuff->xfixesReqType]) (client);
} }

2
xfixes/select.c
View File

@ -202,9 +202,7 @@ int _X_COLD
SProcXFixesSelectSelectionInput(ClientPtr client) SProcXFixesSelectSelectionInput(ClientPtr client)
{ {
REQUEST(xXFixesSelectSelectionInputReq); REQUEST(xXFixesSelectSelectionInputReq);
REQUEST_SIZE_MATCH(xXFixesSelectSelectionInputReq); REQUEST_SIZE_MATCH(xXFixesSelectSelectionInputReq);
swaps(&stuff->length);
swapl(&stuff->window); swapl(&stuff->window);
swapl(&stuff->selection); swapl(&stuff->selection);
swapl(&stuff->eventMask); swapl(&stuff->eventMask);

1
xfixes/xfixes.c
View File

@ -164,7 +164,6 @@ SProcXFixesQueryVersion(ClientPtr client)
REQUEST(xXFixesQueryVersionReq); REQUEST(xXFixesQueryVersionReq);
REQUEST_SIZE_MATCH(xXFixesQueryVersionReq); REQUEST_SIZE_MATCH(xXFixesQueryVersionReq);
swaps(&stuff->length);
swapl(&stuff->majorVersion); swapl(&stuff->majorVersion);
swapl(&stuff->minorVersion); swapl(&stuff->minorVersion);
return (*ProcXFixesVector[stuff->xfixesReqType]) (client); return (*ProcXFixesVector[stuff->xfixesReqType]) (client);