---
src/technology.c | 42 +++++++++++++++++++++---------------------
1 file changed, 21 insertions(+), 21 deletions(-)
diff --git a/src/technology.c b/src/technology.c
index 6d020cb..e3313e1 100644
--- a/src/technology.c
+++ b/src/technology.c
@@ -478,21 +478,21 @@ static void append_properties(DBusMessageIter *iter,
static void technology_added_signal(struct connman_technology *technology)
{
- DBusMessage *signal;
+ DBusMessage *dbus_signal;
DBusMessageIter iter;
- signal = dbus_message_new_signal(CONNMAN_MANAGER_PATH,
+ dbus_signal = dbus_message_new_signal(CONNMAN_MANAGER_PATH,
CONNMAN_MANAGER_INTERFACE, "TechnologyAdded");
- if (signal == NULL)
+ if (dbus_signal == NULL)
return;
- dbus_message_iter_init_append(signal, &iter);
+ dbus_message_iter_init_append(dbus_signal, &iter);
dbus_message_iter_append_basic(&iter, DBUS_TYPE_OBJECT_PATH,
&technology->path);
append_properties(&iter, technology);
- dbus_connection_send(connection, signal, NULL);
- dbus_message_unref(signal);
+ dbus_connection_send(connection, dbus_signal, NULL);
+ dbus_message_unref(dbus_signal);
}
static void technology_removed_signal(struct connman_technology *technology)
@@ -1031,7 +1031,7 @@ static void technology_put(struct connman_technology
*technology)
}
void __connman_technology_add_interface(enum connman_service_type type,
- int index, const char *name, const char *ident)
+ int ifindex, const char *name, const char
*ident)
{
struct connman_technology *technology;
@@ -1060,11 +1060,11 @@ void __connman_technology_add_interface(enum
connman_service_type type,
return;
technology->driver->add_interface(technology,
- index, name, ident);
+ ifindex, name, ident);
}
void __connman_technology_remove_interface(enum connman_service_type type,
- int index, const char *name, const char *ident)
+ int ifindex, const char *name, const char
*ident)
{
struct connman_technology *technology;
@@ -1092,7 +1092,7 @@ void __connman_technology_remove_interface(enum
connman_service_type type,
return;
if (technology->driver->remove_interface)
- technology->driver->remove_interface(technology, index);
+ technology->driver->remove_interface(technology, ifindex);
}
int __connman_technology_add_device(struct connman_device *device)
@@ -1282,7 +1282,7 @@ void __connman_technology_set_connected(enum
connman_service_type type,
DBUS_TYPE_BOOLEAN, &connected);
}
-int __connman_technology_add_rfkill(unsigned int index,
+int __connman_technology_add_rfkill(unsigned int ifindex,
enum connman_service_type type,
connman_bool_t softblock,
connman_bool_t hardblock)
@@ -1290,10 +1290,10 @@ int __connman_technology_add_rfkill(unsigned int index,
struct connman_technology *technology;
struct connman_rfkill *rfkill;
- DBG("index %u type %d soft %u hard %u", index, type,
+ DBG("index %u type %d soft %u hard %u", ifindex, type,
softblock, hardblock);
- rfkill = g_hash_table_lookup(rfkill_list, &index);
+ rfkill = g_hash_table_lookup(rfkill_list, &ifindex);
if (rfkill != NULL)
goto done;
@@ -1301,7 +1301,7 @@ int __connman_technology_add_rfkill(unsigned int index,
if (rfkill == NULL)
return -ENOMEM;
- rfkill->index = index;
+ rfkill->index = ifindex;
rfkill->type = type;
rfkill->softblock = softblock;
rfkill->hardblock = hardblock;
@@ -1337,7 +1337,7 @@ done:
return 0;
}
-int __connman_technology_update_rfkill(unsigned int index,
+int __connman_technology_update_rfkill(unsigned int ifindex,
enum connman_service_type type,
connman_bool_t softblock,
connman_bool_t hardblock)
@@ -1345,9 +1345,9 @@ int __connman_technology_update_rfkill(unsigned int index,
struct connman_technology *technology;
struct connman_rfkill *rfkill;
- DBG("index %u soft %u hard %u", index, softblock, hardblock);
+ DBG("index %u soft %u hard %u", ifindex, softblock, hardblock);
- rfkill = g_hash_table_lookup(rfkill_list, &index);
+ rfkill = g_hash_table_lookup(rfkill_list, &ifindex);
if (rfkill == NULL)
return -ENXIO;
@@ -1378,19 +1378,19 @@ int __connman_technology_update_rfkill(unsigned int
index,
return 0;
}
-int __connman_technology_remove_rfkill(unsigned int index,
+int __connman_technology_remove_rfkill(unsigned int ifindex,
enum connman_service_type type)
{
struct connman_technology *technology;
struct connman_rfkill *rfkill;
- DBG("index %u", index);
+ DBG("index %u", ifindex);
- rfkill = g_hash_table_lookup(rfkill_list, &index);
+ rfkill = g_hash_table_lookup(rfkill_list, &ifindex);
if (rfkill == NULL)
return -ENXIO;
- g_hash_table_remove(rfkill_list, &index);
+ g_hash_table_remove(rfkill_list, &ifindex);
technology = technology_find(type);
if (technology == NULL)
--
1.7.9.5
_______________________________________________
connman mailing list
[email protected]
http://lists.connman.net/listinfo/connman
