From 0670cd5a6af59fdff8191ea2fcbd62e31ab59a0a Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Mon, 15 Jul 2024 19:29:10 +0200
Subject: [PATCH] xkb: XkbWriteKeyBehaviors(): 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>
---
 xkb/xkb.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/xkb/xkb.c b/xkb/xkb.c
index 4a32ad323..096be99a9 100644
--- a/xkb/xkb.c
+++ b/xkb/xkb.c
@@ -1240,18 +1240,17 @@ XkbSizeKeyBehaviors(XkbDescPtr xkb, xkbGetMapReply * rep)
 }
 
 static char *
-XkbWriteKeyBehaviors(XkbDescPtr xkb, xkbGetMapReply * rep, char *buf,
-                     ClientPtr client)
+XkbWriteKeyBehaviors(XkbDescPtr xkb, KeyCode firstKeyBehavior, CARD8 nKeyBehaviors, char *buf)
 {
     unsigned i;
     xkbBehaviorWireDesc *wire;
     XkbBehavior *pBhvr;
 
     wire = (xkbBehaviorWireDesc *) buf;
-    pBhvr = &xkb->server->behaviors[rep->firstKeyBehavior];
-    for (i = 0; i < rep->nKeyBehaviors; i++, pBhvr++) {
+    pBhvr = &xkb->server->behaviors[firstKeyBehavior];
+    for (i = 0; i < nKeyBehaviors; i++, pBhvr++) {
         if (pBhvr->type != XkbKB_Default) {
-            wire->key = i + rep->firstKeyBehavior;
+            wire->key = i + firstKeyBehavior;
             wire->type = pBhvr->type;
             wire->data = pBhvr->data;
             wire++;
@@ -1421,7 +1420,7 @@ XkbSendMap(ClientPtr client, XkbDescPtr xkb, xkbGetMapReply * rep)
     if (rep->nKeyActs > 0)
         desc = XkbWriteKeyActions(xkb, rep->firstKeyAct, rep->nKeyActs, desc);
     if (rep->totalKeyBehaviors > 0)
-        desc = XkbWriteKeyBehaviors(xkb, rep, desc, client);
+        desc = XkbWriteKeyBehaviors(xkb, rep->firstKeyBehavior, rep->nKeyBehaviors, desc);
     if (rep->virtualMods) {
         register int sz, bit;