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

(!1632) 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 2557593ab7
commit efc149c763
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
xkb/xkb.c
View File

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