From 4b3c4ba41bc5d50b9064bd2efd34ec9076e39680 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Mon, 15 Jul 2024 19:20:02 +0200 Subject: [PATCH] (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 --- xkb/xkb.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/xkb/xkb.c b/xkb/xkb.c index 60024e208..e1c2f7a41 100644 --- a/xkb/xkb.c +++ b/xkb/xkb.c @@ -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)