From 6c6839b5d7ee0826523ab8a49beb2484e923db61 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Tue, 21 Apr 2009 05:57:29 +0100 Subject: [PATCH] Rename helper function to get device/network path --- src/connection.c | 4 ++-- src/connman.h | 4 ++-- src/element.c | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/connection.c b/src/connection.c index 62d6a31..6fb1d76 100644 --- a/src/connection.c +++ b/src/connection.c @@ -349,12 +349,12 @@ static DBusMessage *get_properties(DBusConnection *conn, connman_dbus_dict_append_variant(&dict, "Default", DBUS_TYPE_BOOLEAN, &element->enabled); - device = __connman_element_get_device(element); + device = __connman_element_get_device_path(element); if (device != NULL) connman_dbus_dict_append_variant(&dict, "Device", DBUS_TYPE_OBJECT_PATH, &device); - network = __connman_element_get_network(element); + network = __connman_element_get_network_path(element); if (network != NULL) connman_dbus_dict_append_variant(&dict, "Network", DBUS_TYPE_OBJECT_PATH, &network); diff --git a/src/connman.h b/src/connman.h index f370e0d..4ac49a7 100644 --- a/src/connman.h +++ b/src/connman.h @@ -127,8 +127,8 @@ void __connman_element_list(struct connman_element *element, int __connman_element_count(struct connman_element *element, enum connman_element_type type); -const char *__connman_element_get_device(struct connman_element *element); -const char *__connman_element_get_network(struct connman_element *element); +const char *__connman_element_get_device_path(struct connman_element *element); +const char *__connman_element_get_network_path(struct connman_element *element); const char *__connman_element_type2string(enum connman_element_type type); diff --git a/src/element.c b/src/element.c index 7b24a98..3b021da 100644 --- a/src/element.c +++ b/src/element.c @@ -272,7 +272,7 @@ int __connman_element_count(struct connman_element *element, return data.count; } -const char *__connman_element_get_device(struct connman_element *element) +const char *__connman_element_get_device_path(struct connman_element *element) { if (element->type == CONNMAN_ELEMENT_TYPE_DEVICE && element->device != NULL) @@ -281,10 +281,10 @@ const char *__connman_element_get_device(struct connman_element *element) if (element->parent == NULL) return NULL; - return __connman_element_get_device(element->parent); + return __connman_element_get_device_path(element->parent); } -const char *__connman_element_get_network(struct connman_element *element) +const char *__connman_element_get_network_path(struct connman_element *element) { if (element->type == CONNMAN_ELEMENT_TYPE_NETWORK && element->network != NULL) @@ -293,7 +293,7 @@ const char *__connman_element_get_network(struct connman_element *element) if (element->parent == NULL) return NULL; - return __connman_element_get_network(element->parent); + return __connman_element_get_network_path(element->parent); } static gint compare_priority(gconstpointer a, gconstpointer b) -- 2.7.4