XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-03-26 06:04:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

randr: ProcRRQueryOutputProperty(): simplify by using x_rpcbuf_t

Browse Source 
* use x_rpcbuf_t for reply payload assembly and byte-swap
* do byte-swap of header fields explicitly instead of cryptic functions
* drop extra length computation

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2025-07-19 04:03:03 +02:00
committed by Enrico Weigelt
parent 16ab5a1456
commit 6b17a3bfbb
1 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
randr/rrproperty.c
View File

@@ -457,26 +457,24 @@ ProcRRQueryOutputProperty(ClientPtr client)
REQUEST(xRRQueryOutputPropertyReq);
RROutputPtr output;
RRPropertyPtr prop;
char *extra = NULL;
REQUEST_SIZE_MATCH(xRRQueryOutputPropertyReq);
VERIFY_RR_OUTPUT(stuff->output, output, DixReadAccess);
prop = RRQueryOutputProperty(output, stuff->property);
if (!prop)
return BadName;
if (prop->num_valid) {
extra = calloc(prop->num_valid, sizeof(INT32));
if (!extra)
return BadAlloc;
}
x_rpcbuf_t rpcbuf = { .swapped = client->swapped, .err_clear = TRUE };
x_rpcbuf_write_CARD32s(&rpcbuf, (CARD32*)prop->valid_values, prop->num_valid);
if (rpcbuf.error)
return BadAlloc;
xRRQueryOutputPropertyReply rep = {
.type = X_Reply,
.sequenceNumber = client->sequence,
.length = prop->num_valid,
.length = x_rpcbuf_wsize_units(&rpcbuf),
.pending = prop->is_pending,
.range = prop->range,
.immutable = prop->immutable
@@ -486,16 +484,9 @@ ProcRRQueryOutputProperty(ClientPtr client)
swaps(&rep.sequenceNumber);
swapl(&rep.length);
}
if (prop->num_valid) {
memcpy(extra, prop->valid_values, prop->num_valid * sizeof(INT32));
if (client->swapped)
SwapLongs((CARD32*)extra, prop->num_valid);
}
WriteToClient(client, sizeof(xRRQueryOutputPropertyReply), &rep);
WriteToClient(client, prop->num_valid * sizeof(INT32), extra);
free(extra);
WriteRpcbufToClient(client, &rpcbuf);
return Success;
}