From 2557593ab7375ede8f5c85facdae423d308bdab0 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Mon, 15 Jul 2024 19:15:11 +0200 Subject: [PATCH] (!1632) xkb: XkbWriteKeySyms(): 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 --- xkb/xkb.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xkb/xkb.c b/xkb/xkb.c index 27888aa6d..1acb1b016 100644 --- a/xkb/xkb.c +++ b/xkb/xkb.c @@ -1122,7 +1122,7 @@ XkbSizeVirtualMods(XkbDescPtr xkb, xkbGetMapReply * rep) } static char * -XkbWriteKeySyms(XkbDescPtr xkb, xkbGetMapReply * rep, char *buf, +XkbWriteKeySyms(XkbDescPtr xkb, KeyCode firstKeySym, CARD8 nKeySyms, char *buf, ClientPtr client) { register KeySym *pSym; @@ -1130,8 +1130,8 @@ XkbWriteKeySyms(XkbDescPtr xkb, xkbGetMapReply * rep, char *buf, xkbSymMapWireDesc *outMap; register unsigned i; - symMap = &xkb->map->key_sym_map[rep->firstKeySym]; - for (i = 0; i < rep->nKeySyms; i++, symMap++) { + symMap = &xkb->map->key_sym_map[firstKeySym]; + for (i = 0; i < nKeySyms; i++, symMap++) { outMap = (xkbSymMapWireDesc *) buf; outMap->ktIndex[0] = symMap->kt_index[0]; outMap->ktIndex[1] = symMap->kt_index[1]; @@ -1418,7 +1418,7 @@ XkbSendMap(ClientPtr client, XkbDescPtr xkb, xkbGetMapReply * rep) if (rep->nTypes > 0) desc = XkbWriteKeyTypes(xkb, rep, desc, client); if (rep->nKeySyms > 0) - desc = XkbWriteKeySyms(xkb, rep, desc, client); + desc = XkbWriteKeySyms(xkb, rep->firstKeySym, rep->nKeySyms, desc, client); if (rep->nKeyActs > 0) desc = XkbWriteKeyActions(xkb, rep, desc, client); if (rep->totalKeyBehaviors > 0)