[PATCH 01/34] vpn: Avoid shadowing index variable

[Jukka Rissanen]

---
 plugins/vpn.c |   24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/plugins/vpn.c b/plugins/vpn.c
index 165c325..6c97645 100644
--- a/plugins/vpn.c
+++ b/plugins/vpn.c
@@ -175,20 +175,20 @@ vpn_exit:
 int vpn_set_ifname(struct connman_provider *provider, const char *ifname)
 {
        struct vpn_data *data = connman_provider_get_data(provider);
-       int index;
+       int ifindex;
 
        if (ifname == NULL || data == NULL)
                return  -EIO;
 
-       index = connman_inet_ifindex(ifname);
-       if (index < 0)
+       ifindex = connman_inet_ifindex(ifname);
+       if (ifindex < 0)
                return  -EIO;
 
        if (data->if_name != NULL)
                g_free(data->if_name);
 
        data->if_name = (char *)g_strdup(ifname);
-       connman_provider_set_index(provider, index);
+       connman_provider_set_index(provider, ifindex);
 
        return 0;
 }
@@ -215,7 +215,7 @@ static DBusMessage *vpn_notify(struct connman_task *task,
        struct vpn_data *data;
        struct vpn_driver_data *vpn_driver_data;
        const char *name;
-       int state, index;
+       int state, ifindex;
 
        data = connman_provider_get_data(provider);
 
@@ -231,11 +231,11 @@ static DBusMessage *vpn_notify(struct connman_task *task,
        switch (state) {
        case VPN_STATE_CONNECT:
        case VPN_STATE_READY:
-               index = connman_provider_get_index(provider);
+               ifindex = connman_provider_get_index(provider);
                connman_provider_ref(provider);
-               data->watch = connman_rtnl_add_newlink_watch(index,
+               data->watch = connman_rtnl_add_newlink_watch(ifindex,
                                                     vpn_newlink, provider);
-               connman_inet_ifup(index);
+               connman_inet_ifup(ifindex);
                break;
 
        case VPN_STATE_UNKNOWN:
@@ -259,7 +259,7 @@ static int vpn_create_tun(struct connman_provider *provider)
 {
        struct vpn_data *data = connman_provider_get_data(provider);
        struct ifreq ifr;
-       int i, fd, index;
+       int i, fd, ifindex;
        int ret = 0;
 
        if (data == NULL)
@@ -310,14 +310,14 @@ static int vpn_create_tun(struct connman_provider 
*provider)
 
        close(fd);
 
-       index = connman_inet_ifindex(data->if_name);
-       if (index < 0) {
+       ifindex = connman_inet_ifindex(data->if_name);
+       if (ifindex < 0) {
                connman_error("Failed to get tun ifindex");
                stop_vpn(provider);
                ret = -EIO;
                goto exist_err;
        }
-       connman_provider_set_index(provider, index);
+       connman_provider_set_index(provider, ifindex);
 
        return 0;
 
-- 
1.7.9.5

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