From 155d8314a80daabe33521bc26e347f93b8e78018 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Mon, 15 Jul 2024 19:49:50 +0200
Subject: [PATCH] xkb: XkbWriteModifierMap(): 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 | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/xkb/xkb.c b/xkb/xkb.c
index 4df23ef6c..0827aa11f 100644
--- a/xkb/xkb.c
+++ b/xkb/xkb.c
@@ -1324,18 +1324,18 @@ XkbSizeModifierMap(XkbDescPtr xkb, xkbGetMapReply * rep)
 }
 
 static char *
-XkbWriteModifierMap(XkbDescPtr xkb, xkbGetMapReply * rep, char *buf,
-                    ClientPtr client)
+XkbWriteModifierMap(XkbDescPtr xkb, KeyCode firstModMapKey, CARD8 nModMapKeys,
+                    char *buf)
 {
     unsigned i;
     char *start;
     unsigned char *pMap;
 
     start = buf;
-    pMap = &xkb->map->modmap[rep->firstModMapKey];
-    for (i = 0; i < rep->nModMapKeys; i++, pMap++) {
+    pMap = &xkb->map->modmap[firstModMapKey];
+    for (i = 0; i < nModMapKeys; i++, pMap++) {
         if (*pMap != 0) {
-            *buf++ = i + rep->firstModMapKey;
+            *buf++ = i + firstModMapKey;
             *buf++ = *pMap;
         }
     }
@@ -1434,7 +1434,7 @@ XkbSendMap(ClientPtr client, XkbDescPtr xkb, xkbGetMapReply * rep)
     if (rep->totalKeyExplicit > 0)
         desc = XkbWriteExplicit(xkb, rep->firstKeyExplicit, rep->nKeyExplicit, desc);
     if (rep->totalModMapKeys > 0)
-        desc = XkbWriteModifierMap(xkb, rep, desc, client);
+        desc = XkbWriteModifierMap(xkb, rep->firstModMapKey, rep->nModMapKeys, desc);
     if (rep->totalVModMapKeys > 0)
         desc = XkbWriteVirtualModMap(xkb, rep, desc, client);
     if ((desc - start) != (len)) {