From: Daniel Wagner <[email protected]>
To avoid a name clash with the next patch, the
__connman_ipconfig_get_*(index) have to be renamed.
Since they all use an index as lookup argument rename
them to __connman_ipconfig_get_*_from_index(index).
---
src/connman.h | 6 +++---
src/ipconfig.c | 6 +++---
src/rtnl.c | 8 ++++----
src/service.c | 2 +-
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/connman.h b/src/connman.h
index 4e5d624..0bf69aa 100644
--- a/src/connman.h
+++ b/src/connman.h
@@ -218,9 +218,9 @@ void __connman_ipconfig_delroute(int index, int family,
unsigned char scope,
void __connman_ipconfig_foreach(void (*function) (int index, void *user_data),
void *user_data);
-unsigned short __connman_ipconfig_get_type(int index);
-unsigned int __connman_ipconfig_get_flags(int index);
-const char *__connman_ipconfig_get_gateway(int index);
+unsigned short __connman_ipconfig_get_type_from_index(int index);
+unsigned int __connman_ipconfig_get_flags_from_index(int index);
+const char *__connman_ipconfig_get_gateway_from_index(int index);
void __connman_ipconfig_set_index(struct connman_ipconfig *ipconfig, int
index);
int __connman_ipconfig_enable(struct connman_ipconfig *ipconfig);
diff --git a/src/ipconfig.c b/src/ipconfig.c
index a2f198c..1e85eb0 100644
--- a/src/ipconfig.c
+++ b/src/ipconfig.c
@@ -852,7 +852,7 @@ void __connman_ipconfig_foreach(void (*function) (int
index, void *user_data),
g_list_free(keys);
}
-unsigned short __connman_ipconfig_get_type(int index)
+unsigned short __connman_ipconfig_get_type_from_index(int index)
{
struct connman_ipdevice *ipdevice;
@@ -863,7 +863,7 @@ unsigned short __connman_ipconfig_get_type(int index)
return ipdevice->type;
}
-unsigned int __connman_ipconfig_get_flags(int index)
+unsigned int __connman_ipconfig_get_flags_from_index(int index)
{
struct connman_ipdevice *ipdevice;
@@ -874,7 +874,7 @@ unsigned int __connman_ipconfig_get_flags(int index)
return ipdevice->flags;
}
-const char *__connman_ipconfig_get_gateway(int index)
+const char *__connman_ipconfig_get_gateway_from_index(int index)
{
struct connman_ipdevice *ipdevice;
diff --git a/src/rtnl.c b/src/rtnl.c
index 3d42043..c1f0924 100644
--- a/src/rtnl.c
+++ b/src/rtnl.c
@@ -243,7 +243,7 @@ unsigned int connman_rtnl_add_newlink_watch(int index,
DBG("id %d", watch->id);
if (callback) {
- unsigned int flags = __connman_ipconfig_get_flags(index);
+ unsigned int flags =
__connman_ipconfig_get_flags_from_index(index);
if (flags > 0)
callback(flags, 0, user_data);
@@ -283,14 +283,14 @@ static void trigger_rtnl(int index, void *user_data)
struct connman_rtnl *rtnl = user_data;
if (rtnl->newlink) {
- unsigned short type = __connman_ipconfig_get_type(index);
- unsigned int flags = __connman_ipconfig_get_flags(index);
+ unsigned short type =
__connman_ipconfig_get_type_from_index(index);
+ unsigned int flags =
__connman_ipconfig_get_flags_from_index(index);
rtnl->newlink(type, index, flags, 0);
}
if (rtnl->newgateway) {
- const char *gateway = __connman_ipconfig_get_gateway(index);
+ const char *gateway =
__connman_ipconfig_get_gateway_from_index(index);
if (gateway != NULL)
rtnl->newgateway(index, gateway);
diff --git a/src/service.c b/src/service.c
index e914197..cc23fc8 100644
--- a/src/service.c
+++ b/src/service.c
@@ -2122,7 +2122,7 @@ static DBusMessage *set_property(DBusConnection *conn,
return __connman_error_invalid_arguments(msg);
index = connman_network_get_index(service->network);
- gw = __connman_ipconfig_get_gateway(index);
+ gw = __connman_ipconfig_get_gateway_from_index(index);
if (gw && strlen(gw))
__connman_service_nameserver_del_routes(service);
--
1.7.4
_______________________________________________
connman mailing list
[email protected]
http://lists.connman.net/listinfo/connman
