From 3ca8dfb5adfea5f6e7b5aece69c91d7abce29ced Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Thu, 12 May 2016 09:45:34 -0500 Subject: [PATCH] wiphy: move & rename iwd_device_get_path Move declaration to device.h and rename to device_get_path --- src/device.h | 1 + src/manager.c | 3 ++- src/wiphy.c | 16 ++++++++-------- src/wiphy.h | 1 - src/wsc.c | 2 +- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/device.h b/src/device.h index 713bddb5..f5a7ee45 100644 --- a/src/device.h +++ b/src/device.h @@ -36,6 +36,7 @@ void __device_watch_call_added(struct netdev *device); void __device_watch_call_removed(struct netdev *device); struct network *device_get_connected_network(struct netdev *device); +const char *device_get_path(struct netdev *device); bool device_init(void); bool device_exit(void); diff --git a/src/manager.c b/src/manager.c index 621c0bbb..f6c93413 100644 --- a/src/manager.c +++ b/src/manager.c @@ -29,6 +29,7 @@ #include "src/dbus.h" #include "src/wiphy.h" #include "src/agent.h" +#include "src/device.h" static void append_device(struct netdev *netdev, void *user_data) { @@ -36,7 +37,7 @@ static void append_device(struct netdev *netdev, void *user_data) l_dbus_message_builder_enter_dict(builder, "oa{sv}"); l_dbus_message_builder_append_basic(builder, 'o', - iwd_device_get_path(netdev)); + device_get_path(netdev)); __iwd_device_append_properties(netdev, builder); l_dbus_message_builder_leave_dict(builder); } diff --git a/src/wiphy.c b/src/wiphy.c index 7347a409..3fbb5607 100644 --- a/src/wiphy.c +++ b/src/wiphy.c @@ -139,7 +139,7 @@ static const char *iwd_network_get_path(struct netdev *netdev, static char path[256]; unsigned int pos, i; - pos = snprintf(path, sizeof(path), "%s/", iwd_device_get_path(netdev)); + pos = snprintf(path, sizeof(path), "%s/", device_get_path(netdev)); for (i = 0; i < ssid_len && pos < sizeof(path); i++) pos += snprintf(path + pos, sizeof(path) - pos, "%02x", @@ -516,7 +516,7 @@ static void network_emit_added(struct network *network) struct l_dbus_message_builder *builder; signal = l_dbus_message_new_signal(dbus, - iwd_device_get_path(network->netdev), + device_get_path(network->netdev), IWD_DEVICE_INTERFACE, "NetworkAdded"); @@ -544,7 +544,7 @@ static void network_emit_removed(struct network *network) struct l_dbus_message *signal; signal = l_dbus_message_new_signal(dbus, - iwd_device_get_path(network->netdev), + device_get_path(network->netdev), IWD_DEVICE_INTERFACE, "NetworkRemoved"); @@ -585,7 +585,7 @@ static void network_free(void *data) l_free(network); } -const char *iwd_device_get_path(struct netdev *netdev) +const char *device_get_path(struct netdev *netdev) { static char path[12]; @@ -649,7 +649,7 @@ static void device_emit_added(struct netdev *netdev) } l_dbus_message_builder_append_basic(builder, 'o', - iwd_device_get_path(netdev)); + device_get_path(netdev)); __iwd_device_append_properties(netdev, builder); l_dbus_message_builder_finalize(builder); @@ -669,7 +669,7 @@ static void device_emit_removed(struct netdev *netdev) if (!signal) return; - l_dbus_message_set_arguments(signal, "o", iwd_device_get_path(netdev)); + l_dbus_message_set_arguments(signal, "o", device_get_path(netdev)); l_dbus_send(dbus, signal); } @@ -874,7 +874,7 @@ static void netdev_free(void *data) __device_watch_call_removed(netdev); dbus = dbus_get_bus(); - l_dbus_unregister_object(dbus, iwd_device_get_path(netdev)); + l_dbus_unregister_object(dbus, device_get_path(netdev)); device_emit_removed(netdev); @@ -1896,7 +1896,7 @@ static void interface_dump_callback(struct l_genl_msg *msg, void *user_data) l_queue_push_head(wiphy->netdev_list, netdev); if (!l_dbus_object_add_interface(dbus, - iwd_device_get_path(netdev), + device_get_path(netdev), IWD_DEVICE_INTERFACE, netdev)) l_info("Unable to register %s interface", IWD_DEVICE_INTERFACE); diff --git a/src/wiphy.h b/src/wiphy.h index df7e40de..4471d860 100644 --- a/src/wiphy.h +++ b/src/wiphy.h @@ -35,4 +35,3 @@ void wiphy_notify_dellink(uint32_t index); bool __iwd_device_append_properties(struct netdev *netdev, struct l_dbus_message_builder *builder); void __iwd_device_foreach(iwd_device_foreach_func func, void *user_data); -const char *iwd_device_get_path(struct netdev *netdev); diff --git a/src/wsc.c b/src/wsc.c index 5767d995..e6b845ee 100644 --- a/src/wsc.c +++ b/src/wsc.c @@ -303,7 +303,7 @@ static void device_appeared(struct netdev *device, void *userdata) wsc = l_new(struct wsc, 1); wsc->netdev = device; - if (!l_dbus_object_add_interface(dbus, iwd_device_get_path(device), + if (!l_dbus_object_add_interface(dbus, device_get_path(device), IWD_WSC_INTERFACE, wsc)) { wsc_free(wsc);