frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(!1601) Xext: xres: ProcXResQueryClientResources() simplify payload write out 

Collect the few bits in a local array, so one WriteToClient() call is
sufficient. That's also easing further simplifications in upcoming commits.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-07-17 13:18:10 +02:00
parent 97ef16e966
commit ed927df59c
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Xext/xres.c
View File

@ -307,10 +307,14 @@ ProcXResQueryClientResources(ClientPtr client)
FindAllClientResources(clients[clientID], ResFindAllRes, counts); FindAllClientResources(clients[clientID], ResFindAllRes, counts);
int cnt[lastResourceType + 1];
for (i = 0; i <= lastResourceType; i++) { for (i = 0; i <= lastResourceType; i++) {
if (counts[i]) if (counts[i]) {
cnt[num_types] = counts[i];
num_types++; num_types++;
} }
}
xXResQueryClientResourcesReply rep = { xXResQueryClientResourcesReply rep = {
.type = X_Reply, .type = X_Reply,
@ -324,26 +328,20 @@ ProcXResQueryClientResources(ClientPtr client)
swapl(&rep.num_types); swapl(&rep.num_types);
} }
WriteToClient(client, sizeof(xXResQueryClientResourcesReply), &rep); xXResType scratch[num_types];
if (num_types) { for (i = 0; i < num_types; i++) {
xXResType scratch; scratch[i].resource_type = resourceTypeAtom(i + 1);
scratch[i].count = cnt[i];
for (i = 0; i < lastResourceType; i++) {
if (!counts[i])
continue;
scratch.resource_type = resourceTypeAtom(i + 1);
scratch.count = counts[i];
if (client->swapped) { if (client->swapped) {
swapl(&scratch.resource_type); swapl(&scratch[i].resource_type);
swapl(&scratch.count); swapl(&scratch[i].count);
}
WriteToClient(client, sz_xXResType, &scratch);
} }
} }
WriteToClient(client, sizeof(xXResQueryClientResourcesReply), &rep);
WriteToClient(client, sizeof(scratch), scratch);
return Success; return Success;
} }