StreetLight
/
libxkbcommon
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove 'force' argument from BindIndicators 

It was always true in the one callsite, so just remove the other
branches.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
master
Daniel Stone 2012-07-03 21:13:11 +01:00
parent 1f49290131
commit cfed7960ad
3 changed files with 24 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/xkbcomp/compat.c
View File

@ -825,7 +825,7 @@ CompileCompatMap(XkbFile *file, struct xkb_keymap *keymap, enum merge_mode merge
info.leds = NULL;
}
if (!BindIndicators(keymap, true, unbound, NULL)) {
if (!BindIndicators(keymap, unbound, NULL)) {
while (unbound) {
next = (LEDInfo *) unbound->defs.next;
free(unbound);

70
src/xkbcomp/indicators.c
View File

@ -433,8 +433,7 @@ CopyIndicatorMapDefs(struct xkb_keymap *keymap, LEDInfo *leds,
}
bool
BindIndicators(struct xkb_keymap *keymap, bool force, LEDInfo *unbound,
LEDInfo **unboundRtrn)
BindIndicators(struct xkb_keymap *keymap, LEDInfo *unbound, LEDInfo **unboundRtrn)
{
int i;
LEDInfo *led, *next, *last;
@ -457,30 +456,27 @@ BindIndicators(struct xkb_keymap *keymap, bool force, LEDInfo *unbound,
}
}
}
if (force)
for (led = unbound; led != NULL; led = (LEDInfo *) led->defs.next)
{
for (led = unbound; led != NULL; led = (LEDInfo *) led->defs.next)
if (led->indicator == _LED_NotBound)
{
for (i = 0; i < XkbNumIndicators; i++)
{
if (keymap->names->indicators[i] == NULL)
{
keymap->names->indicators[i] =
xkb_atom_strdup(keymap->ctx, led->name);
led->indicator = i + 1;
break;
}
}
if (led->indicator == _LED_NotBound)
{
for (i = 0; i < XkbNumIndicators; i++)
{
if (keymap->names->indicators[i] == NULL)
{
keymap->names->indicators[i] =
xkb_atom_strdup(keymap->ctx, led->name);
led->indicator = i + 1;
break;
}
}
if (led->indicator == _LED_NotBound)
{
ERROR("No unnamed indicators found\n");
ACTION
("Virtual indicator map \"%s\" not bound\n",
xkb_atom_text(keymap->ctx, led->name));
continue;
}
ERROR("No unnamed indicators found\n");
ACTION
("Virtual indicator map \"%s\" not bound\n",
xkb_atom_text(keymap->ctx, led->name));
continue;
}
}
}
@ -490,19 +486,8 @@ BindIndicators(struct xkb_keymap *keymap, bool force, LEDInfo *unbound,
next = (LEDInfo *) led->defs.next;
if (led->indicator == _LED_NotBound)
{
if (force)
{
unbound = next;
free(led);
}
else
{
if (last)
last->defs.next = &led->defs;
else
unbound = led;
last = led;
}
unbound = next;
free(led);
}
else
{
@ -516,19 +501,8 @@ BindIndicators(struct xkb_keymap *keymap, bool force, LEDInfo *unbound,
ACTION("Using %s, ignoring %s\n", old,
xkb_atom_text(keymap->ctx, led->name));
led->indicator = _LED_NotBound;
if (force)
{
free(led);
unbound = next;
}
else
{
if (last)
last->defs.next = &led->defs;
else
unbound = led;
last = led;
}
unbound = next;
free(led);
}
else
{

2
src/xkbcomp/indicators.h
View File

@ -73,7 +73,7 @@ CopyIndicatorMapDefs(struct xkb_keymap *keymap, LEDInfo *leds,
LEDInfo **unboundRtrn);
extern bool
BindIndicators(struct xkb_keymap *keymap, bool force, LEDInfo *unbound,
BindIndicators(struct xkb_keymap *keymap, LEDInfo *unbound,
LEDInfo **unboundRtrn);
#endif /* INDICATORS_H */