[PATCH 20/34] provider: Avoid shadowing index variable

[Jukka Rissanen]

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

diff --git a/src/provider.c b/src/provider.c
index 3f4bb1c..5380480 100644
--- a/src/provider.c
+++ b/src/provider.c
@@ -464,16 +464,16 @@ static void provider_append_routes(gpointer key, gpointer 
value,
 {
        struct connman_route *route = value;
        struct connman_provider *provider = user_data;
-       int index = provider->index;
+       int ifindex = provider->index;
 
        if (route->family == AF_INET6) {
                unsigned char prefix_len = atoi(route->netmask);
 
-               connman_inet_add_ipv6_network_route(index, route->host,
+               connman_inet_add_ipv6_network_route(ifindex, route->host,
                                                        route->gateway,
                                                        prefix_len);
        } else {
-               connman_inet_add_network_route(index, route->host,
+               connman_inet_add_network_route(ifindex, route->host,
                                                route->gateway,
                                                route->netmask);
        }
@@ -1010,7 +1010,7 @@ void connman_provider_set_data(struct connman_provider 
*provider, void *data)
        provider->driver_data = data;
 }
 
-void connman_provider_set_index(struct connman_provider *provider, int index)
+void connman_provider_set_index(struct connman_provider *provider, int ifindex)
 {
        struct connman_service *service = provider->vpn_service;
        struct connman_ipconfig *ipconfig;
@@ -1023,7 +1023,7 @@ void connman_provider_set_index(struct connman_provider 
*provider, int index)
        ipconfig = __connman_service_get_ip4config(service);
 
        if (ipconfig == NULL) {
-               __connman_service_create_ip4config(service, index);
+               __connman_service_create_ip4config(service, ifindex);
 
                ipconfig = __connman_service_get_ip4config(service);
                if (ipconfig == NULL) {
@@ -1033,13 +1033,13 @@ void connman_provider_set_index(struct connman_provider 
*provider, int index)
        }
 
        __connman_ipconfig_set_method(ipconfig, CONNMAN_IPCONFIG_METHOD_FIXED);
-       __connman_ipconfig_set_index(ipconfig, index);
+       __connman_ipconfig_set_index(ipconfig, ifindex);
 
 
        ipconfig = __connman_service_get_ip6config(service);
 
        if (ipconfig == NULL) {
-               __connman_service_create_ip6config(service, index);
+               __connman_service_create_ip6config(service, ifindex);
 
                ipconfig = __connman_service_get_ip6config(service);
                if (ipconfig == NULL) {
@@ -1049,10 +1049,10 @@ void connman_provider_set_index(struct connman_provider 
*provider, int index)
        }
 
        __connman_ipconfig_set_method(ipconfig, CONNMAN_IPCONFIG_METHOD_OFF);
-       __connman_ipconfig_set_index(ipconfig, index);
+       __connman_ipconfig_set_index(ipconfig, ifindex);
 
 done:
-       provider->index = index;
+       provider->index = ifindex;
 }
 
 int connman_provider_get_index(struct connman_provider *provider)
@@ -1294,7 +1294,7 @@ static void provider_offline_mode(connman_bool_t enabled)
 
 }
 
-static struct connman_provider *provider_get(int index)
+static struct connman_provider *provider_get(int ifindex)
 {
        GHashTableIter iter;
        gpointer value, key;
@@ -1304,7 +1304,7 @@ static struct connman_provider *provider_get(int index)
        while (g_hash_table_iter_next(&iter, &key, &value) == TRUE) {
                struct connman_provider *provider = value;
 
-               if (provider->index == index)
+               if (provider->index == ifindex)
                        return provider;
        }
 
-- 
1.7.9.5

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