From 9116e02d6f911ff67c7db4a5878e5278217f3975 Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniel@fooishbar.org>
Date: Tue, 3 Jul 2012 21:15:28 +0100
Subject: [PATCH] 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>
---
 src/xkbcomp/compat.c     |  2 +-
 src/xkbcomp/indicators.c | 17 ++++++-----------
 src/xkbcomp/indicators.h |  3 +--
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/xkbcomp/compat.c b/src/xkbcomp/compat.c
index b88623f..7cd88b5 100644
--- a/src/xkbcomp/compat.c
+++ b/src/xkbcomp/compat.c
@@ -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);
diff --git a/src/xkbcomp/indicators.c b/src/xkbcomp/indicators.c
index 7c0f9b6..211a47c 100644
--- a/src/xkbcomp/indicators.c
+++ b/src/xkbcomp/indicators.c
@@ -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;
 }
diff --git a/src/xkbcomp/indicators.h b/src/xkbcomp/indicators.h
index 6d7f2b0..c46814f 100644
--- a/src/xkbcomp/indicators.h
+++ b/src/xkbcomp/indicators.h
@@ -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 */
-- 
2.7.4