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

randr: ProcRRGetCrtcGamma(): use x_rpcbuf_t for reply payload assembly

Browse Source 
Simplify reply payload assembly and byte-swap by using x_rpcbuf_t.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2025-07-18 22:15:37 +02:00
committed by Enrico Weigelt
parent 70c7c00fae
commit 578a554d0a
1 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
randr/rrcrtc.c
View File

@@ -1631,8 +1631,6 @@ ProcRRGetCrtcGamma(ClientPtr client)
{
REQUEST(xRRGetCrtcGammaReq);
RRCrtcPtr crtc;
unsigned long len;
char *extra = NULL;
REQUEST_SIZE_MATCH(xRRGetCrtcGammaReq);
VERIFY_RR_CRTC(stuff->crtc, crtc, DixReadAccess);
@@ -1641,18 +1639,16 @@ ProcRRGetCrtcGamma(ClientPtr client)
if (!RRCrtcGammaGet(crtc))
return RRErrorBase + BadRRCrtc;
len = crtc->gammaSize * 3 * 2;
x_rpcbuf_t rpcbuf = { .swapped = client->swapped, .err_clear = TRUE };
if (crtc->gammaSize) {
extra = calloc(1, len);
if (!extra)
return BadAlloc;
}
x_rpcbuf_write_CARD16s(&rpcbuf, crtc->gammaRed, crtc->gammaSize);
x_rpcbuf_write_CARD16s(&rpcbuf, crtc->gammaGreen, crtc->gammaSize);
x_rpcbuf_write_CARD16s(&rpcbuf, crtc->gammaBlue, crtc->gammaSize);
xRRGetCrtcGammaReply reply = {
.type = X_Reply,
.sequenceNumber = client->sequence,
.length = bytes_to_int32(len),
.length = x_rpcbuf_wsize_units(&rpcbuf),
.size = crtc->gammaSize
};
if (client->swapped) {
@@ -1660,16 +1656,9 @@ ProcRRGetCrtcGamma(ClientPtr client)
swapl(&reply.length);
swaps(&reply.size);
}
if (crtc->gammaSize) {
memcpy(extra, crtc->gammaRed, len);
if (client->swapped)
SwapShorts((short*)extra, len/sizeof(CARD16));
}
WriteToClient(client, sizeof(xRRGetCrtcGammaReply), &reply);
WriteToClient(client, len, extra);
free(extra);
WriteRpcbufToClient(client, &rpcbuf);
return Success;
}