[PATCH 30/34] tethering: Avoid shadowing index variable

[Jukka Rissanen]

---
 src/tethering.c |   26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/tethering.c b/src/tethering.c
index decb112..0905b3b 100644
--- a/src/tethering.c
+++ b/src/tethering.c
@@ -131,15 +131,15 @@ static GDHCPServer *dhcp_server_start(const char *bridge,
 {
        GDHCPServerError error;
        GDHCPServer *dhcp_server;
-       int index;
+       int ifindex;
 
        DBG("");
 
-       index = connman_inet_ifindex(bridge);
-       if (index < 0)
+       ifindex = connman_inet_ifindex(bridge);
+       if (ifindex < 0)
                return NULL;
 
-       dhcp_server = g_dhcp_server_new(G_DHCP_IPV4, index, &error);
+       dhcp_server = g_dhcp_server_new(G_DHCP_IPV4, ifindex, &error);
        if (dhcp_server == NULL) {
                dhcp_server_error(error);
                return NULL;
@@ -174,7 +174,7 @@ static void tethering_restart(struct connman_ippool *pool, 
void *user_data)
 
 void __connman_tethering_set_enabled(void)
 {
-       int index;
+       int ifindex;
        int err;
        const char *gateway;
        const char *broadcast;
@@ -193,8 +193,8 @@ void __connman_tethering_set_enabled(void)
        if (err < 0)
                return;
 
-       index = connman_inet_ifindex(BRIDGE_NAME);
-       dhcp_ippool = __connman_ippool_create(index, 2, 252,
+       ifindex = connman_inet_ifindex(BRIDGE_NAME);
+       dhcp_ippool = __connman_ippool_create(ifindex, 2, 252,
                                                tethering_restart, NULL);
        if (dhcp_ippool == NULL) {
                connman_error("Fail to create IP pool");
@@ -375,7 +375,7 @@ int __connman_private_network_request(DBusMessage *msg, 
const char *owner)
        struct connman_private_network *pn;
        char *iface = NULL;
        char *path = NULL;
-       int index, fd, err;
+       int ifindex, fd, err;
 
        if (DBUS_TYPE_UNIX_FD < 0)
                return -EINVAL;
@@ -394,14 +394,14 @@ int __connman_private_network_request(DBusMessage *msg, 
const char *owner)
                return -EEXIST;
        }
 
-       index = connman_inet_ifindex(iface);
-       if (index < 0) {
+       ifindex = connman_inet_ifindex(iface);
+       if (ifindex < 0) {
                err = -ENODEV;
                goto error;
        }
        DBG("interface %s", iface);
 
-       err = connman_inet_set_mtu(index, DEFAULT_MTU);
+       err = connman_inet_set_mtu(ifindex, DEFAULT_MTU);
 
        pn = g_try_new0(struct connman_private_network, 1);
        if (pn == NULL) {
@@ -420,7 +420,7 @@ int __connman_private_network_request(DBusMessage *msg, 
const char *owner)
 
        pn->fd = fd;
        pn->interface = iface;
-       pn->index = index;
+       pn->index = ifindex;
        pn->pool = __connman_ippool_create(pn->index, 1, 1, ippool_disconnect, 
pn);
        if (pn->pool == NULL) {
                errno = -ENOMEM;
@@ -430,7 +430,7 @@ int __connman_private_network_request(DBusMessage *msg, 
const char *owner)
        pn->primary_dns = PRIVATE_NETWORK_PRIMARY_DNS;
        pn->secondary_dns = PRIVATE_NETWORK_SECONDARY_DNS;
 
-       pn->iface_watch = connman_rtnl_add_newlink_watch(index,
+       pn->iface_watch = connman_rtnl_add_newlink_watch(ifindex,
                                                setup_tun_interface, pn);
 
        g_hash_table_insert(pn_hash, pn->path, pn);
-- 
1.7.9.5

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