(1623) xkb: XkbWriteKeyTypes(): only pass in the needed data

We don't need the whole struct here, especially do we not wanna change it.
Therefore only pass in what's really needed, so it gets easier to understand.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-07-15 19:20:02 +02:00
parent df095dc71a
commit 4b3c4ba41b

View File

@ -1015,15 +1015,15 @@ XkbSizeKeyTypes(XkbDescPtr xkb, xkbGetMapReply * rep)
}
static char *
XkbWriteKeyTypes(XkbDescPtr xkb,
xkbGetMapReply * rep, char *buf, ClientPtr client)
XkbWriteKeyTypes(XkbDescPtr xkb, CARD8 firstType, CARD8 nTypes,
char *buf, ClientPtr client)
{
XkbKeyTypePtr type;
unsigned i;
xkbKeyTypeWireDesc *wire;
type = &xkb->map->types[rep->firstType];
for (i = 0; i < rep->nTypes; i++, type++) {
type = &xkb->map->types[firstType];
for (i = 0; i < nTypes; i++, type++) {
register unsigned n;
wire = (xkbKeyTypeWireDesc *) buf;
@ -1416,7 +1416,7 @@ XkbSendMap(ClientPtr client, XkbDescPtr xkb, xkbGetMapReply * rep)
if (!start)
return BadAlloc;
if (rep->nTypes > 0)
desc = XkbWriteKeyTypes(xkb, rep, desc, client);
desc = XkbWriteKeyTypes(xkb, rep->firstType, rep->nTypes, desc, client);
if (rep->nKeySyms > 0)
desc = XkbWriteKeySyms(xkb, rep->firstKeySym, rep->nKeySyms, desc, client);
if (rep->nKeyActs > 0)