XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-04-14 17:18:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

render: ProcRenderQueryPictFormats(): use x_rpcbuf_t

Browse Source 
Use x_rpcbuf_t for reply payload assembly and X_SEND_REPLY_WITH_RPCBUF()
for sending it all out.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2025-09-01 17:19:50 +02:00
committed by Enrico Weigelt
parent 60dc405def
commit fe9fcfe98f
1 changed files with 20 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
render/render.c
View File

@@ -303,7 +303,6 @@ ProcRenderQueryPictFormats(ClientPtr client)
xPictScreen *pictScreen;
xPictDepth *pictDepth;
xPictVisual *pictVisual;
xPictFormInfo *pictForm;
CARD32 *pictSubpixel;
VisualPtr pVisual;
DepthPtr pDepth;
@@ -350,25 +349,16 @@ ProcRenderQueryPictFormats(ClientPtr client)
else
numSubpixel = numScreens;
rlength = (sizeof(xRenderQueryPictFormatsReply) +
nformat * sizeof(xPictFormInfo) +
rlength = (nformat * sizeof(xPictFormInfo) +
numScreens * sizeof(xPictScreen) +
ndepth * sizeof(xPictDepth) +
nvisual * sizeof(xPictVisual) + numSubpixel * sizeof(CARD32));
xRenderQueryPictFormatsReply *reply = calloc(1, rlength);
if (!reply)
return BadAlloc;
reply->type = X_Reply;
reply->sequenceNumber = client->sequence;
reply->length = bytes_to_int32(rlength - sizeof(xGenericReply));
reply->numFormats = nformat;
reply->numScreens = numScreens;
reply->numDepths = ndepth;
reply->numVisuals = nvisual;
reply->numSubpixel = numSubpixel;
x_rpcbuf_t rpcbuf = { .swapped = client->swapped, .err_clear = TRUE };
pictForm = (xPictFormInfo *) (reply + 1);
xPictFormInfo *pictForm = x_rpcbuf_reserve(&rpcbuf, rlength);
if (!pictForm)
return BadAlloc;
for (unsigned int walkScreenIdx = 0; walkScreenIdx < numScreens; walkScreenIdx++) {
ScreenPtr walkScreen = screenInfo.screens[walkScreenIdx];
@@ -470,18 +460,23 @@ ProcRenderQueryPictFormats(ClientPtr client)
++pictSubpixel;
}
xRenderQueryPictFormatsReply reply = {
.numFormats = nformat,
.numScreens = numScreens,
.numDepths = ndepth,
.numVisuals = nvisual,
.numSubpixel = numSubpixel,
};
if (client->swapped) {
swaps(&reply->sequenceNumber);
swapl(&reply->length);
swapl(&reply->numFormats);
swapl(&reply->numScreens);
swapl(&reply->numDepths);
swapl(&reply->numVisuals);
swapl(&reply->numSubpixel);
swapl(&reply.numFormats);
swapl(&reply.numScreens);
swapl(&reply.numDepths);
swapl(&reply.numVisuals);
swapl(&reply.numSubpixel);
}
WriteToClient(client, rlength, reply);
free(reply);
return Success;
return X_SEND_REPLY_WITH_RPCBUF(client, reply, rpcbuf);
}
static int