From ad825bb2d384467b0ac8b02e503ceb375f0e5a5e Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Tue, 6 Aug 2024 14:34:17 +0200 Subject: [PATCH] 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 Part-of: (cherry picked from commit eea9e4e84be6cb682c3f33a4a756431ec2b908a8) --- xfixes/cursor.c | 19 ------------------- xfixes/disconnect.c | 6 ------ xfixes/region.c | 34 ---------------------------------- xfixes/saveset.c | 1 - xfixes/select.c | 2 -- xfixes/xfixes.c | 1 - 6 files changed, 63 deletions(-) diff --git a/xfixes/cursor.c b/xfixes/cursor.c index 31c88b2a7..1b9025a52 100644 --- a/xfixes/cursor.c +++ b/xfixes/cursor.c @@ -299,8 +299,6 @@ SProcXFixesSelectCursorInput(ClientPtr client) { REQUEST(xXFixesSelectCursorInputReq); REQUEST_SIZE_MATCH(xXFixesSelectCursorInputReq); - - swaps(&stuff->length); swapl(&stuff->window); swapl(&stuff->eventMask); return (*ProcXFixesVector[stuff->xfixesReqType]) (client); @@ -419,7 +417,6 @@ int _X_COLD SProcXFixesGetCursorImage(ClientPtr client) { REQUEST(xXFixesGetCursorImageReq); - swaps(&stuff->length); return (*ProcXFixesVector[stuff->xfixesReqType]) (client); } @@ -447,8 +444,6 @@ int _X_COLD SProcXFixesSetCursorName(ClientPtr client) { REQUEST(xXFixesSetCursorNameReq); - - swaps(&stuff->length); REQUEST_AT_LEAST_SIZE(xXFixesSetCursorNameReq); swapl(&stuff->cursor); swaps(&stuff->nbytes); @@ -496,8 +491,6 @@ int _X_COLD SProcXFixesGetCursorName(ClientPtr client) { REQUEST(xXFixesGetCursorNameReq); - - swaps(&stuff->length); REQUEST_SIZE_MATCH(xXFixesGetCursorNameReq); swapl(&stuff->cursor); return (*ProcXFixesVector[stuff->xfixesReqType]) (client); @@ -576,7 +569,6 @@ int _X_COLD SProcXFixesGetCursorImageAndName(ClientPtr client) { REQUEST(xXFixesGetCursorImageAndNameReq); - swaps(&stuff->length); return (*ProcXFixesVector[stuff->xfixesReqType]) (client); } @@ -703,8 +695,6 @@ int _X_COLD SProcXFixesChangeCursor(ClientPtr client) { REQUEST(xXFixesChangeCursorReq); - - swaps(&stuff->length); REQUEST_SIZE_MATCH(xXFixesChangeCursorReq); swapl(&stuff->source); swapl(&stuff->destination); @@ -742,8 +732,6 @@ int _X_COLD SProcXFixesChangeCursorByName(ClientPtr client) { REQUEST(xXFixesChangeCursorByNameReq); - - swaps(&stuff->length); REQUEST_AT_LEAST_SIZE(xXFixesChangeCursorByNameReq); swapl(&stuff->source); swaps(&stuff->nbytes); @@ -901,8 +889,6 @@ int _X_COLD SProcXFixesHideCursor(ClientPtr client) { REQUEST(xXFixesHideCursorReq); - - swaps(&stuff->length); REQUEST_SIZE_MATCH(xXFixesHideCursorReq); swapl(&stuff->window); return (*ProcXFixesVector[stuff->xfixesReqType]) (client); @@ -951,8 +937,6 @@ int _X_COLD SProcXFixesShowCursor(ClientPtr client) { REQUEST(xXFixesShowCursorReq); - - swaps(&stuff->length); REQUEST_SIZE_MATCH(xXFixesShowCursorReq); swapl(&stuff->window); return (*ProcXFixesVector[stuff->xfixesReqType]) (client); @@ -1026,7 +1010,6 @@ SProcXFixesCreatePointerBarrier(ClientPtr client) REQUEST_AT_LEAST_SIZE(xXFixesCreatePointerBarrierReq); - swaps(&stuff->length); swaps(&stuff->num_devices); REQUEST_FIXED_SIZE(xXFixesCreatePointerBarrierReq, pad_to_int32(stuff->num_devices * sizeof(CARD16))); @@ -1059,8 +1042,6 @@ int _X_COLD SProcXFixesDestroyPointerBarrier(ClientPtr client) { REQUEST(xXFixesDestroyPointerBarrierReq); - - swaps(&stuff->length); REQUEST_SIZE_MATCH(xXFixesDestroyPointerBarrierReq); swapl(&stuff->barrier); return ProcXFixesVector[stuff->xfixesReqType] (client); diff --git a/xfixes/disconnect.c b/xfixes/disconnect.c index 28aac45aa..f11e72c5e 100644 --- a/xfixes/disconnect.c +++ b/xfixes/disconnect.c @@ -77,9 +77,6 @@ int _X_COLD SProcXFixesSetClientDisconnectMode(ClientPtr client) { REQUEST(xXFixesSetClientDisconnectModeReq); - - swaps(&stuff->length); - REQUEST_AT_LEAST_SIZE(xXFixesSetClientDisconnectModeReq); swapl(&stuff->disconnect_mode); @@ -114,9 +111,6 @@ int _X_COLD SProcXFixesGetClientDisconnectMode(ClientPtr client) { REQUEST(xXFixesGetClientDisconnectModeReq); - - swaps(&stuff->length); - REQUEST_SIZE_MATCH(xXFixesGetClientDisconnectModeReq); return (*ProcXFixesVector[stuff->xfixesReqType]) (client); diff --git a/xfixes/region.c b/xfixes/region.c index 1927a013e..03c6afb88 100644 --- a/xfixes/region.c +++ b/xfixes/region.c @@ -95,8 +95,6 @@ int _X_COLD SProcXFixesCreateRegion(ClientPtr client) { REQUEST(xXFixesCreateRegionReq); - - swaps(&stuff->length); REQUEST_AT_LEAST_SIZE(xXFixesCreateRegionReq); swapl(&stuff->region); SwapRestS(stuff); @@ -139,8 +137,6 @@ int _X_COLD SProcXFixesCreateRegionFromBitmap(ClientPtr client) { REQUEST(xXFixesCreateRegionFromBitmapReq); - - swaps(&stuff->length); REQUEST_SIZE_MATCH(xXFixesCreateRegionFromBitmapReq); swapl(&stuff->region); swapl(&stuff->bitmap); @@ -198,8 +194,6 @@ int _X_COLD SProcXFixesCreateRegionFromWindow(ClientPtr client) { REQUEST(xXFixesCreateRegionFromWindowReq); - - swaps(&stuff->length); REQUEST_SIZE_MATCH(xXFixesCreateRegionFromWindowReq); swapl(&stuff->region); swapl(&stuff->window); @@ -241,8 +235,6 @@ int _X_COLD SProcXFixesCreateRegionFromGC(ClientPtr client) { REQUEST(xXFixesCreateRegionFromGCReq); - - swaps(&stuff->length); REQUEST_SIZE_MATCH(xXFixesCreateRegionFromGCReq); swapl(&stuff->region); swapl(&stuff->gc); @@ -283,8 +275,6 @@ int _X_COLD SProcXFixesCreateRegionFromPicture(ClientPtr client) { REQUEST(xXFixesCreateRegionFromPictureReq); - - swaps(&stuff->length); REQUEST_SIZE_MATCH(xXFixesCreateRegionFromPictureReq); swapl(&stuff->region); swapl(&stuff->picture); @@ -307,8 +297,6 @@ int _X_COLD SProcXFixesDestroyRegion(ClientPtr client) { REQUEST(xXFixesDestroyRegionReq); - - swaps(&stuff->length); REQUEST_SIZE_MATCH(xXFixesDestroyRegionReq); swapl(&stuff->region); return (*ProcXFixesVector[stuff->xfixesReqType]) (client); @@ -345,8 +333,6 @@ int _X_COLD SProcXFixesSetRegion(ClientPtr client) { REQUEST(xXFixesSetRegionReq); - - swaps(&stuff->length); REQUEST_AT_LEAST_SIZE(xXFixesSetRegionReq); swapl(&stuff->region); SwapRestS(stuff); @@ -374,8 +360,6 @@ int _X_COLD SProcXFixesCopyRegion(ClientPtr client) { REQUEST(xXFixesCopyRegionReq); - - swaps(&stuff->length); REQUEST_SIZE_MATCH(xXFixesCopyRegionReq); swapl(&stuff->source); swapl(&stuff->destination); @@ -416,8 +400,6 @@ int _X_COLD SProcXFixesCombineRegion(ClientPtr client) { REQUEST(xXFixesCombineRegionReq); - - swaps(&stuff->length); REQUEST_SIZE_MATCH(xXFixesCombineRegionReq); swapl(&stuff->source1); swapl(&stuff->source2); @@ -460,8 +442,6 @@ int _X_COLD SProcXFixesInvertRegion(ClientPtr client) { REQUEST(xXFixesInvertRegionReq); - - swaps(&stuff->length); REQUEST_SIZE_MATCH(xXFixesInvertRegionReq); swapl(&stuff->source); swaps(&stuff->x); @@ -490,8 +470,6 @@ int _X_COLD SProcXFixesTranslateRegion(ClientPtr client) { REQUEST(xXFixesTranslateRegionReq); - - swaps(&stuff->length); REQUEST_SIZE_MATCH(xXFixesTranslateRegionReq); swapl(&stuff->region); swaps(&stuff->dx); @@ -519,8 +497,6 @@ int _X_COLD SProcXFixesRegionExtents(ClientPtr client) { REQUEST(xXFixesRegionExtentsReq); - - swaps(&stuff->length); REQUEST_SIZE_MATCH(xXFixesRegionExtentsReq); swapl(&stuff->source); swapl(&stuff->destination); @@ -584,8 +560,6 @@ int _X_COLD SProcXFixesFetchRegion(ClientPtr client) { REQUEST(xXFixesFetchRegionReq); - - swaps(&stuff->length); REQUEST_SIZE_MATCH(xXFixesFetchRegionReq); swapl(&stuff->region); return (*ProcXFixesVector[stuff->xfixesReqType]) (client); @@ -627,8 +601,6 @@ int _X_COLD SProcXFixesSetGCClipRegion(ClientPtr client) { REQUEST(xXFixesSetGCClipRegionReq); - - swaps(&stuff->length); REQUEST_SIZE_MATCH(xXFixesSetGCClipRegionReq); swapl(&stuff->gc); swapl(&stuff->region); @@ -717,8 +689,6 @@ int _X_COLD SProcXFixesSetWindowShapeRegion(ClientPtr client) { REQUEST(xXFixesSetWindowShapeRegionReq); - - swaps(&stuff->length); REQUEST_SIZE_MATCH(xXFixesSetWindowShapeRegionReq); swapl(&stuff->dest); swaps(&stuff->xOff); @@ -750,8 +720,6 @@ int _X_COLD SProcXFixesSetPictureClipRegion(ClientPtr client) { REQUEST(xXFixesSetPictureClipRegionReq); - - swaps(&stuff->length); REQUEST_SIZE_MATCH(xXFixesSetPictureClipRegionReq); swapl(&stuff->picture); swapl(&stuff->region); @@ -803,8 +771,6 @@ int _X_COLD SProcXFixesExpandRegion(ClientPtr client) { REQUEST(xXFixesExpandRegionReq); - - swaps(&stuff->length); REQUEST_SIZE_MATCH(xXFixesExpandRegionReq); swapl(&stuff->source); swapl(&stuff->destination); diff --git a/xfixes/saveset.c b/xfixes/saveset.c index fd9c7a124..8f23886c1 100644 --- a/xfixes/saveset.c +++ b/xfixes/saveset.c @@ -64,7 +64,6 @@ SProcXFixesChangeSaveSet(ClientPtr client) REQUEST(xXFixesChangeSaveSetReq); REQUEST_SIZE_MATCH(xXFixesChangeSaveSetReq); - swaps(&stuff->length); swapl(&stuff->window); return (*ProcXFixesVector[stuff->xfixesReqType]) (client); } diff --git a/xfixes/select.c b/xfixes/select.c index f7efd5221..85e450bdf 100644 --- a/xfixes/select.c +++ b/xfixes/select.c @@ -202,9 +202,7 @@ int _X_COLD SProcXFixesSelectSelectionInput(ClientPtr client) { REQUEST(xXFixesSelectSelectionInputReq); - REQUEST_SIZE_MATCH(xXFixesSelectSelectionInputReq); - swaps(&stuff->length); swapl(&stuff->window); swapl(&stuff->selection); swapl(&stuff->eventMask); diff --git a/xfixes/xfixes.c b/xfixes/xfixes.c index 3d044f918..1d3c4a83a 100644 --- a/xfixes/xfixes.c +++ b/xfixes/xfixes.c @@ -166,7 +166,6 @@ SProcXFixesQueryVersion(ClientPtr client) REQUEST(xXFixesQueryVersionReq); REQUEST_SIZE_MATCH(xXFixesQueryVersionReq); - swaps(&stuff->length); swapl(&stuff->majorVersion); swapl(&stuff->minorVersion); return (*ProcXFixesVector[stuff->xfixesReqType]) (client);