[PATCH 33/34] 6to4: Avoid shadowing index variable

[Jukka Rissanen]

---
 src/6to4.c |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/6to4.c b/src/6to4.c
index 340b69e..5990265 100644
--- a/src/6to4.c
+++ b/src/6to4.c
@@ -137,13 +137,13 @@ static int tunnel_add_route()
 {
        struct __connman_inet_rtnl_handle rth;
        struct in6_addr addr6;
-       int index;
+       int ifindex;
        int ret = 0;
 
        /* ip -6 route add ::/0 via ::192.88.99.1 dev tun6to4 metric 1 */
 
-       index = if_nametoindex("tun6to4");
-       if (index == 0) {
+       ifindex = if_nametoindex("tun6to4");
+       if (ifindex == 0) {
                DBG("Can not find device tun6to4");
                return -1;
        }
@@ -165,7 +165,7 @@ static int tunnel_add_route()
        __connman_inet_rtnl_addattr_l(&rth.req.n, sizeof(rth.req), RTA_GATEWAY,
                                        &addr6.s6_addr, 16);
        __connman_inet_rtnl_addattr32(&rth.req.n, sizeof(rth.req), RTA_OIF,
-                                       index);
+                                       ifindex);
        __connman_inet_rtnl_addattr32(&rth.req.n, sizeof(rth.req),
                                        RTA_PRIORITY, 1);
 
@@ -286,7 +286,7 @@ static gboolean newlink_timeout(gpointer user_data)
 
 static void tun_newlink(unsigned flags, unsigned change, void *user_data)
 {
-       int index = GPOINTER_TO_INT(user_data);
+       int ifindex = GPOINTER_TO_INT(user_data);
 
        if ((newlink_flags & IFF_UP) == (flags & IFF_UP)) {
                newlink_flags = flags;
@@ -302,7 +302,7 @@ static void tun_newlink(unsigned flags, unsigned change, 
void *user_data)
                        newlink_timeout_id = 0;
                }
 
-               web = g_web_new(index);
+               web = g_web_new(ifindex);
                if (web == NULL) {
                        tunnel_destroy();
                        return;
@@ -399,7 +399,7 @@ int __connman_6to4_probe(struct connman_service *service)
        in_addr_t addr;
        const char *address;
        char *ip_address;
-       int index;
+       int ifindex;
 
        DBG("service %p", service);
 
@@ -438,14 +438,14 @@ int __connman_6to4_probe(struct connman_service *service)
                                        (a == 172 && (b >= 16 && b <= 31)))
                return -1;
 
-       index = __connman_ipconfig_get_index(ip4config);
+       ifindex = __connman_ipconfig_get_index(ip4config);
        ip_address = g_strdup(address);
        tunnel_pending = 1;
 
        g_free(tunnel_ip_address);
        tunnel_ip_address = g_strdup(address);
 
-       return __connman_inet_ipv6_send_rs(index, 2, receive_rs_reply,
+       return __connman_inet_ipv6_send_rs(ifindex, 2, receive_rs_reply,
                                                        ip_address);
 }
 
-- 
1.7.9.5

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