Remove 'unboundRtrn' argument from BindIndicators

It was only ever passed as NULL from its single callsite, so just remove
it and be done with it.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
master
Daniel Stone 2012-07-03 21:15:28 +01:00
parent cfed7960ad
commit 9116e02d6f
3 changed files with 8 additions and 14 deletions

View File

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

View File

@ -433,7 +433,7 @@ CopyIndicatorMapDefs(struct xkb_keymap *keymap, LEDInfo *leds,
}
bool
BindIndicators(struct xkb_keymap *keymap, LEDInfo *unbound, LEDInfo **unboundRtrn)
BindIndicators(struct xkb_keymap *keymap, LEDInfo *unbound)
{
int i;
LEDInfo *led, *next, *last;
@ -525,17 +525,12 @@ BindIndicators(struct xkb_keymap *keymap, LEDInfo *unbound, LEDInfo **unboundRtr
}
}
}
if (unboundRtrn)
for (led = unbound; led != NULL; led = next)
{
*unboundRtrn = unbound;
}
else
{
for (led = unbound; led != NULL; led = next)
{
next = led ? (LEDInfo *) led->defs.next : NULL;
free(led);
}
next = led ? (LEDInfo *) led->defs.next : NULL;
free(led);
}
return true;
}

View File

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