[PATCH 34/34] bridge: Avoid shadowing index variable

[Jukka Rissanen]

---
 src/bridge.c |   22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/bridge.c b/src/bridge.c
index 2849ef7..f251e2e 100644
--- a/src/bridge.c
+++ b/src/bridge.c
@@ -112,28 +112,28 @@ int __connman_bridge_remove(const char *name)
 int __connman_bridge_enable(const char *name, const char *gateway,
                                const char *broadcast)
 {
-       int err, index;
+       int err, ifindex;
 
-       index = connman_inet_ifindex(name);
-       if (index < 0)
-               return index;
+       ifindex = connman_inet_ifindex(name);
+       if (ifindex < 0)
+               return ifindex;
 
        err = __connman_inet_modify_address(RTM_NEWADDR,
-                       NLM_F_REPLACE | NLM_F_ACK, index, AF_INET,
+                       NLM_F_REPLACE | NLM_F_ACK, ifindex, AF_INET,
                                        gateway, NULL, 24, broadcast);
        if (err < 0)
                return err;
 
-       return connman_inet_ifup(index);
+       return connman_inet_ifup(ifindex);
 }
 
 int __connman_bridge_disable(const char *name)
 {
-       int index;
+       int ifindex;
 
-       index = connman_inet_ifindex(name);
-       if (index < 0)
-               return index;
+       ifindex = connman_inet_ifindex(name);
+       if (ifindex < 0)
+               return ifindex;
 
-       return connman_inet_ifdown(index);
+       return connman_inet_ifdown(ifindex);
 }
-- 
1.7.9.5

_______________________________________________
connman mailing list
connman@connman.net
http://lists.connman.net/listinfo/connman