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

xkb: ProcXkbGetDeviceInfo(): consolidate buffers to reduce writes 

Putting both payload pieces into one buffer, so it can be written out
with only one call.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-07-16 12:29:55 +02:00 committed by Enrico Weigelt, metux IT consult .
parent dff3e38a67
commit b3a47dcbc4
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
xkb/xkb.c
View File

@ -6382,7 +6382,6 @@ ProcXkbGetDeviceInfo(ClientPtr client)
unsigned length, nameLen;
CARD16 ledClass, ledID;
unsigned wanted;
char *str;
REQUEST(xkbGetDeviceInfoReq);
REQUEST_SIZE_MATCH(xkbGetDeviceInfoReq);
@ -6484,23 +6483,25 @@ ProcXkbGetDeviceInfo(ClientPtr client)
}
WriteToClient(client, SIZEOF(xkbGetDeviceInfoReply), &rep);
str = malloc(nameLen);
if (!str)
int sz = nameLen + rep.nBtnsRtrn * sizeof(xkbActionWireDesc);
char *buf = calloc(1, sz);
if (!buf)
return BadAlloc;
XkbWriteCountedString(str, dev->name, client->swapped);
WriteToClient(client, nameLen, str);
free(str);
length -= nameLen;
char *walk = buf;
XkbWriteCountedString(walk, dev->name, client->swapped);
walk += nameLen;
if (rep.nBtnsRtrn > 0) {
int sz;
xkbActionWireDesc *awire;
sz = rep.nBtnsRtrn * SIZEOF(xkbActionWireDesc);
awire = (xkbActionWireDesc *) &dev->button->xkb_acts[rep.firstBtnRtrn];
WriteToClient(client, sz, awire);
length -= sz;
memcpy(walk,
&dev->button->xkb_acts[rep.firstBtnRtrn],
sizeof(xkbActionWireDesc)*rep.nBtnsRtrn);
walk += sizeof(xkbActionWireDesc)*rep.nBtnsRtrn;
}
WriteToClient(client, sz, buf);
length -= sz;
if (nDeviceLedFBs > 0) {
status = SendDeviceLedFBs(dev, ledClass, ledID, length, client);
if (status != Success)