[PATCH 23/34] detect: Avoid shadowing index variable

[Jukka Rissanen]

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

diff --git a/src/detect.c b/src/detect.c
index f4b5d29..c1deb78 100644
--- a/src/detect.c
+++ b/src/detect.c
@@ -29,29 +29,29 @@
 
 static GSList *device_list = NULL;
 
-static struct connman_device *find_device(int index)
+static struct connman_device *find_device(int ifindex)
 {
        GSList *list;
 
        for (list = device_list; list; list = list->next) {
                struct connman_device *device = list->data;
 
-               if (connman_device_get_index(device) == index)
+               if (connman_device_get_index(device) == ifindex)
                        return device;
        }
 
        return NULL;
 }
 
-static void detect_newlink(unsigned short type, int index,
+static void detect_newlink(unsigned short type, int ifindex,
                                        unsigned flags, unsigned change)
 {
        struct connman_device *device;
        enum connman_device_type devtype;
 
-       DBG("type %d index %d", type, index);
+       DBG("type %d index %d", type, ifindex);
 
-       devtype = __connman_rtnl_get_device_type(index);
+       devtype = __connman_rtnl_get_device_type(ifindex);
 
        switch (devtype) {
        case CONNMAN_DEVICE_TYPE_UNKNOWN:
@@ -67,11 +67,11 @@ static void detect_newlink(unsigned short type, int index,
                break;
        }
 
-       device = find_device(index);
+       device = find_device(ifindex);
        if (device != NULL)
                return;
 
-       device = connman_inet_create_device(index);
+       device = connman_inet_create_device(ifindex);
        if (device == NULL)
                return;
 
@@ -83,14 +83,14 @@ static void detect_newlink(unsigned short type, int index,
        device_list = g_slist_append(device_list, device);
 }
 
-static void detect_dellink(unsigned short type, int index,
+static void detect_dellink(unsigned short type, int ifindex,
                                        unsigned flags, unsigned change)
 {
        struct connman_device *device;
 
-       DBG("type %d index %d", type, index);
+       DBG("type %d index %d", type, ifindex);
 
-       device = find_device(index);
+       device = find_device(ifindex);
        if (device == NULL)
                return;
 
-- 
1.7.9.5

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