XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-03-24 05:54:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

dix: ProcQueryColors(): use x_rpcbuf_t

Browse Source 
Use x_rpcbuf_t for 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-02 19:26:38 +02:00
committed by Enrico Weigelt
parent a41114cbe7
commit 15340ce053
1 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
dix/dispatch.c
View File

@@ -2894,37 +2894,29 @@ ProcQueryColors(ClientPtr client)
client, DixReadAccess);
if (rc == Success) {
int count;
xrgb *prgbs;
count =
bytes_to_int32((client->req_len << 2) - sizeof(xQueryColorsReq));
prgbs = calloc(count, sizeof(xrgb));
x_rpcbuf_t rpcbuf = { .swapped = client->swapped, .err_clear = TRUE };
xrgb *prgbs = x_rpcbuf_reserve(&rpcbuf, count * sizeof(xrgb));
if (!prgbs && count)
return BadAlloc;
if ((rc =
QueryColors(pcmp, count, (Pixel *) &stuff[1], prgbs, client))) {
free(prgbs);
x_rpcbuf_clear(&rpcbuf);
return rc;
}
xQueryColorsReply rep = {
.type = X_Reply,
.sequenceNumber = client->sequence,
.length = bytes_to_int32(count * sizeof(xrgb)),
.nColors = count
};
if (client->swapped) {
swaps(&rep.sequenceNumber);
swapl(&rep.length);
swaps(&rep.nColors);
SwapShorts((short*)prgbs, count * 4); // xrgb = 4 shorts
}
WriteToClient(client, sizeof(rep), &rep);
WriteToClient(client, count * sizeof(xrgb), prgbs);
free(prgbs);
return Success;
return X_SEND_REPLY_WITH_RPCBUF(client, rep, rpcbuf);
}
else {
client->errorValue = stuff->cmap;