[PATCH 31/34] wpad: Avoid shadowing index variable

[Jukka Rissanen]

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

diff --git a/src/wpad.c b/src/wpad.c
index 4e5834e..771a4b1 100644
--- a/src/wpad.c
+++ b/src/wpad.c
@@ -126,7 +126,7 @@ int __connman_wpad_start(struct connman_service *service)
        struct connman_wpad *wpad;
        const char *domainname;
        char **nameservers;
-       int index;
+       int ifindex;
        int i;
 
        DBG("service %p", service);
@@ -134,8 +134,8 @@ int __connman_wpad_start(struct connman_service *service)
        if (wpad_list == NULL)
                return -EINVAL;
 
-       index = __connman_service_get_index(service);
-       if (index < 0)
+       ifindex = __connman_service_get_index(service);
+       if (ifindex < 0)
                return -EINVAL;
 
        domainname = connman_service_get_domainname(service);
@@ -153,7 +153,7 @@ int __connman_wpad_start(struct connman_service *service)
        }
 
        wpad->service = service;
-       wpad->resolv = g_resolv_new(index);
+       wpad->resolv = g_resolv_new(ifindex);
        if (wpad->resolv == NULL) {
                g_strfreev(nameservers);
                g_free(wpad);
@@ -176,25 +176,25 @@ int __connman_wpad_start(struct connman_service *service)
                                                        wpad_result, wpad);
 
        connman_service_ref(service);
-       g_hash_table_replace(wpad_list, GINT_TO_POINTER(index), wpad);
+       g_hash_table_replace(wpad_list, GINT_TO_POINTER(ifindex), wpad);
 
        return 0;
 }
 
 void __connman_wpad_stop(struct connman_service *service)
 {
-       int index;
+       int ifindex;
 
        DBG("service %p", service);
 
        if (wpad_list == NULL)
                return;
 
-       index = __connman_service_get_index(service);
-       if (index < 0)
+       ifindex = __connman_service_get_index(service);
+       if (ifindex < 0)
                return;
 
-       if (g_hash_table_remove(wpad_list, GINT_TO_POINTER(index)) == TRUE)
+       if (g_hash_table_remove(wpad_list, GINT_TO_POINTER(ifindex)) == TRUE)
                connman_service_unref(service);
 }
 
-- 
1.7.9.5

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