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

composite: 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:47 +02:00 committed by Marge Bot
parent eea9e4e84b
commit 96344583e4
1 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
composite/compext.c
View File

@ -378,8 +378,6 @@ static int _X_COLD
SProcCompositeQueryVersion(ClientPtr client) SProcCompositeQueryVersion(ClientPtr client)
{ {
REQUEST(xCompositeQueryVersionReq); REQUEST(xCompositeQueryVersionReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xCompositeQueryVersionReq); REQUEST_SIZE_MATCH(xCompositeQueryVersionReq);
swapl(&stuff->majorVersion); swapl(&stuff->majorVersion);
swapl(&stuff->minorVersion); swapl(&stuff->minorVersion);
@ -390,8 +388,6 @@ static int _X_COLD
SProcCompositeRedirectWindow(ClientPtr client) SProcCompositeRedirectWindow(ClientPtr client)
{ {
REQUEST(xCompositeRedirectWindowReq); REQUEST(xCompositeRedirectWindowReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xCompositeRedirectWindowReq); REQUEST_SIZE_MATCH(xCompositeRedirectWindowReq);
swapl(&stuff->window); swapl(&stuff->window);
return (*ProcCompositeVector[stuff->compositeReqType]) (client); return (*ProcCompositeVector[stuff->compositeReqType]) (client);
@ -401,8 +397,6 @@ static int _X_COLD
SProcCompositeRedirectSubwindows(ClientPtr client) SProcCompositeRedirectSubwindows(ClientPtr client)
{ {
REQUEST(xCompositeRedirectSubwindowsReq); REQUEST(xCompositeRedirectSubwindowsReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xCompositeRedirectSubwindowsReq); REQUEST_SIZE_MATCH(xCompositeRedirectSubwindowsReq);
swapl(&stuff->window); swapl(&stuff->window);
return (*ProcCompositeVector[stuff->compositeReqType]) (client); return (*ProcCompositeVector[stuff->compositeReqType]) (client);
@ -412,8 +406,6 @@ static int _X_COLD
SProcCompositeUnredirectWindow(ClientPtr client) SProcCompositeUnredirectWindow(ClientPtr client)
{ {
REQUEST(xCompositeUnredirectWindowReq); REQUEST(xCompositeUnredirectWindowReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xCompositeUnredirectWindowReq); REQUEST_SIZE_MATCH(xCompositeUnredirectWindowReq);
swapl(&stuff->window); swapl(&stuff->window);
return (*ProcCompositeVector[stuff->compositeReqType]) (client); return (*ProcCompositeVector[stuff->compositeReqType]) (client);
@ -423,8 +415,6 @@ static int _X_COLD
SProcCompositeUnredirectSubwindows(ClientPtr client) SProcCompositeUnredirectSubwindows(ClientPtr client)
{ {
REQUEST(xCompositeUnredirectSubwindowsReq); REQUEST(xCompositeUnredirectSubwindowsReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xCompositeUnredirectSubwindowsReq); REQUEST_SIZE_MATCH(xCompositeUnredirectSubwindowsReq);
swapl(&stuff->window); swapl(&stuff->window);
return (*ProcCompositeVector[stuff->compositeReqType]) (client); return (*ProcCompositeVector[stuff->compositeReqType]) (client);
@ -434,8 +424,6 @@ static int _X_COLD
SProcCompositeCreateRegionFromBorderClip(ClientPtr client) SProcCompositeCreateRegionFromBorderClip(ClientPtr client)
{ {
REQUEST(xCompositeCreateRegionFromBorderClipReq); REQUEST(xCompositeCreateRegionFromBorderClipReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xCompositeCreateRegionFromBorderClipReq); REQUEST_SIZE_MATCH(xCompositeCreateRegionFromBorderClipReq);
swapl(&stuff->region); swapl(&stuff->region);
swapl(&stuff->window); swapl(&stuff->window);
@ -446,8 +434,6 @@ static int _X_COLD
SProcCompositeNameWindowPixmap(ClientPtr client) SProcCompositeNameWindowPixmap(ClientPtr client)
{ {
REQUEST(xCompositeNameWindowPixmapReq); REQUEST(xCompositeNameWindowPixmapReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xCompositeNameWindowPixmapReq); REQUEST_SIZE_MATCH(xCompositeNameWindowPixmapReq);
swapl(&stuff->window); swapl(&stuff->window);
swapl(&stuff->pixmap); swapl(&stuff->pixmap);
@ -458,8 +444,6 @@ static int _X_COLD
SProcCompositeGetOverlayWindow(ClientPtr client) SProcCompositeGetOverlayWindow(ClientPtr client)
{ {
REQUEST(xCompositeGetOverlayWindowReq); REQUEST(xCompositeGetOverlayWindowReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xCompositeGetOverlayWindowReq); REQUEST_SIZE_MATCH(xCompositeGetOverlayWindowReq);
swapl(&stuff->window); swapl(&stuff->window);
return (*ProcCompositeVector[stuff->compositeReqType]) (client); return (*ProcCompositeVector[stuff->compositeReqType]) (client);
@ -469,8 +453,6 @@ static int _X_COLD
SProcCompositeReleaseOverlayWindow(ClientPtr client) SProcCompositeReleaseOverlayWindow(ClientPtr client)
{ {
REQUEST(xCompositeReleaseOverlayWindowReq); REQUEST(xCompositeReleaseOverlayWindowReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xCompositeReleaseOverlayWindowReq); REQUEST_SIZE_MATCH(xCompositeReleaseOverlayWindowReq);
swapl(&stuff->window); swapl(&stuff->window);
return (*ProcCompositeVector[stuff->compositeReqType]) (client); return (*ProcCompositeVector[stuff->compositeReqType]) (client);