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

Xext: xv: ProcXvQueryAdaptors(): linearize control flow

Browse Source 
Preparation for subsequent changes: instead of returning early when no
payload to send, move that into a conditional block.
(the WriteRpcbufToClient() call on potentially empty buffer is intentional)

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2025-07-17 21:31:39 +02:00
committed by Enrico Weigelt
parent c54f284f42
commit 9c203cad57
1 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
Xext/xvdisp.c
View File

@@ -137,32 +137,31 @@ ProcXvQueryAdaptors(ClientPtr client)
}
WriteToClient(client, sizeof(rep), &rep);
if (!pxvs) /* no payload to send, we're done here */
return Success;
na = pxvs->nAdaptors;
pa = pxvs->pAdaptors;
while (na--) {
/* xvAdaptorInfo */
x_rpcbuf_write_CARD32(&rpcbuf, pa->base_id);
x_rpcbuf_write_CARD16(&rpcbuf, strlen(pa->name));
x_rpcbuf_write_CARD16(&rpcbuf, pa->nPorts);
x_rpcbuf_write_CARD16(&rpcbuf, pa->nFormats);
x_rpcbuf_write_CARD8(&rpcbuf, pa->type);
x_rpcbuf_write_CARD8(&rpcbuf, 0); /* padding */
x_rpcbuf_write_string_pad(&rpcbuf, pa->name);
nf = pa->nFormats;
pf = pa->pFormats;
while (nf--) {
/* xvFormat */
x_rpcbuf_write_CARD32(&rpcbuf, pf->visual);
x_rpcbuf_write_CARD8(&rpcbuf, pf->depth);
if (pxvs) {
na = pxvs->nAdaptors;
pa = pxvs->pAdaptors;
while (na--) {
/* xvAdaptorInfo */
x_rpcbuf_write_CARD32(&rpcbuf, pa->base_id);
x_rpcbuf_write_CARD16(&rpcbuf, strlen(pa->name));
x_rpcbuf_write_CARD16(&rpcbuf, pa->nPorts);
x_rpcbuf_write_CARD16(&rpcbuf, pa->nFormats);
x_rpcbuf_write_CARD8(&rpcbuf, pa->type);
x_rpcbuf_write_CARD8(&rpcbuf, 0); /* padding */
x_rpcbuf_write_CARD16(&rpcbuf, 0); /* padding */
pf++;
x_rpcbuf_write_string_pad(&rpcbuf, pa->name);
nf = pa->nFormats;
pf = pa->pFormats;
while (nf--) {
/* xvFormat */
x_rpcbuf_write_CARD32(&rpcbuf, pf->visual);
x_rpcbuf_write_CARD8(&rpcbuf, pf->depth);
x_rpcbuf_write_CARD8(&rpcbuf, 0); /* padding */
x_rpcbuf_write_CARD16(&rpcbuf, 0); /* padding */
pf++;
}
pa++;
}
pa++;
}
WriteRpcbufToClient(client, &rpcbuf);
return Success;