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

xkb: XkbSendIndicatorMap() pass in reply struct as value instead of pointer 

It's not passing back any data via that pointer and actually the last
consumer of it. Changing it to value instead of pointer clears the
road for further simplifications by subsequent patches.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-07-16 10:22:52 +02:00
parent f3176bae97
commit 800025954e
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
xkb/xkb.c
View File

@ -3173,24 +3173,24 @@ XkbComputeGetIndicatorMapReplySize(XkbIndicatorPtr indicators,
static int static int
XkbSendIndicatorMap(ClientPtr client, XkbSendIndicatorMap(ClientPtr client,
XkbIndicatorPtr indicators, xkbGetIndicatorMapReply * rep) XkbIndicatorPtr indicators, xkbGetIndicatorMapReply rep)
{ {
int length; int length;
CARD8 *map; CARD8 *map;
register int i; register int i;
register unsigned bit; register unsigned bit;
if (rep->length > 0) { if (rep.length > 0) {
CARD8 *to; CARD8 *to;
to = map = calloc(rep->length, 4); to = map = calloc(rep.length, 4);
if (map) { if (map) {
xkbIndicatorMapWireDesc *wire = (xkbIndicatorMapWireDesc *) to; xkbIndicatorMapWireDesc *wire = (xkbIndicatorMapWireDesc *) to;
length = rep->length * 4; length = rep.length * 4;
for (i = 0, bit = 1; i < XkbNumIndicators; i++, bit <<= 1) { for (i = 0, bit = 1; i < XkbNumIndicators; i++, bit <<= 1) {
if (rep->which & bit) { if (rep.which & bit) {
wire->flags = indicators->maps[i].flags; wire->flags = indicators->maps[i].flags;
wire->whichGroups = indicators->maps[i].which_groups; wire->whichGroups = indicators->maps[i].which_groups;
wire->groups = indicators->maps[i].groups; wire->groups = indicators->maps[i].groups;
@ -3219,12 +3219,12 @@ XkbSendIndicatorMap(ClientPtr client,
else else
map = NULL; map = NULL;
if (client->swapped) { if (client->swapped) {
swaps(&rep->sequenceNumber); swaps(&rep.sequenceNumber);
swapl(&rep->length); swapl(&rep.length);
swapl(&rep->which); swapl(&rep.which);
swapl(&rep->realIndicators); swapl(&rep.realIndicators);
} }
WriteToClient(client, SIZEOF(xkbGetIndicatorMapReply), rep); WriteToClient(client, sizeof(xkbGetIndicatorMapReply), &rep);
if (map) { if (map) {
WriteToClient(client, length, map); WriteToClient(client, length, map);
free((char *) map); free((char *) map);
@ -3257,7 +3257,7 @@ ProcXkbGetIndicatorMap(ClientPtr client)
.which = stuff->which .which = stuff->which
}; };
XkbComputeGetIndicatorMapReplySize(leds, &rep); XkbComputeGetIndicatorMapReplySize(leds, &rep);
return XkbSendIndicatorMap(client, leds, &rep); return XkbSendIndicatorMap(client, leds, rep);
} }
/** /**
@ -6111,7 +6111,7 @@ ProcXkbGetKbdByName(ClientPtr client)
if (reported & XkbGBN_CompatMapMask) if (reported & XkbGBN_CompatMapMask)
XkbSendCompatMap(client, new->compat, crep); XkbSendCompatMap(client, new->compat, crep);
if (reported & XkbGBN_IndicatorMapMask) if (reported & XkbGBN_IndicatorMapMask)
XkbSendIndicatorMap(client, new->indicators, &irep); XkbSendIndicatorMap(client, new->indicators, irep);
if (reported & (XkbGBN_KeyNamesMask | XkbGBN_OtherNamesMask)) if (reported & (XkbGBN_KeyNamesMask | XkbGBN_OtherNamesMask))
XkbSendNames(client, new, &nrep); XkbSendNames(client, new, &nrep);
if (reported & XkbGBN_GeometryMask) if (reported & XkbGBN_GeometryMask)