[PATCH 13/34] ofono: Avoid shadowing index variable

[Jukka Rissanen]

---
 plugins/ofono.c |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/plugins/ofono.c b/plugins/ofono.c
index 1fb075c..edd6186 100644
--- a/plugins/ofono.c
+++ b/plugins/ofono.c
@@ -745,7 +745,7 @@ static void extract_ipv4_settings(DBusMessageIter *array,
        char *address = NULL, *netmask = NULL, *gateway = NULL;
        char *nameservers = NULL;
        const char *interface = NULL;
-       int index = -1;
+       int ifindex = -1;
 
        if (dbus_message_iter_get_arg_type(array) != DBUS_TYPE_ARRAY)
                return;
@@ -767,9 +767,9 @@ static void extract_ipv4_settings(DBusMessageIter *array,
 
                        DBG("Interface %s", interface);
 
-                       index = connman_inet_ifindex(interface);
+                       ifindex = connman_inet_ifindex(interface);
 
-                       DBG("index %d", index);
+                       DBG("index %d", ifindex);
                } else if (g_str_equal(key, "Method") == TRUE) {
                        dbus_message_iter_get_basic(&value, &val);
 
@@ -808,7 +808,7 @@ static void extract_ipv4_settings(DBusMessageIter *array,
                dbus_message_iter_next(&dict);
        }
 
-       if (index < 0)
+       if (ifindex < 0)
                goto out;
 
        if (context->ipv4_method != CONNMAN_IPCONFIG_METHOD_FIXED)
@@ -818,7 +818,7 @@ static void extract_ipv4_settings(DBusMessageIter *array,
        if (context->ipv4_address == NULL)
                goto out;
 
-       context->index = index;
+       context->index = ifindex;
        connman_ipaddress_set_ipv4(context->ipv4_address, address,
                                netmask, gateway);
 
@@ -841,7 +841,7 @@ static void extract_ipv6_settings(DBusMessageIter *array,
        unsigned char prefix_length = 0;
        char *nameservers = NULL;
        const char *interface = NULL;
-       int index = -1;
+       int ifindex = -1;
 
        if (dbus_message_iter_get_arg_type(array) != DBUS_TYPE_ARRAY)
                return;
@@ -863,9 +863,9 @@ static void extract_ipv6_settings(DBusMessageIter *array,
 
                        DBG("Interface %s", interface);
 
-                       index = connman_inet_ifindex(interface);
+                       ifindex = connman_inet_ifindex(interface);
 
-                       DBG("index %d", index);
+                       DBG("index %d", ifindex);
                } else if (g_str_equal(key, "Address") == TRUE) {
                        dbus_message_iter_get_basic(&value, &val);
 
@@ -891,7 +891,7 @@ static void extract_ipv6_settings(DBusMessageIter *array,
                dbus_message_iter_next(&dict);
        }
 
-       if (index < 0)
+       if (ifindex < 0)
                goto out;
 
        context->ipv6_method = CONNMAN_IPCONFIG_METHOD_FIXED;
@@ -901,7 +901,7 @@ static void extract_ipv6_settings(DBusMessageIter *array,
        if (context->ipv6_address == NULL)
                goto out;
 
-       context->index = index;
+       context->index = ifindex;
        connman_ipaddress_set_ipv6(context->ipv6_address, address,
                                prefix_length, gateway);
 
-- 
1.7.9.5

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