Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-11-26 02:19:26 +01:00
Code Releases Activity

client: truncate long property strings

Browse Source 
provide accessors for the vendor and model properties
This commit is contained in:
Tim Kourt 2018-08-02 18:01:53 -07:00 committed by Denis Kenzior
parent 8238ca7fce
commit 273d5d264a
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
client/adapter.c
View File

@ -77,6 +77,13 @@ static void update_vendor(void *data, struct l_dbus_message_iter *variant)
adapter->vendor = l_strdup(value); adapter->vendor = l_strdup(value);
} }
static const char *get_vendor(const void *data)
{
const struct adapter *adapter = data;
return adapter->vendor;
}
static void update_model(void *data, struct l_dbus_message_iter *variant) static void update_model(void *data, struct l_dbus_message_iter *variant)
{ {
struct adapter *adapter = data; struct adapter *adapter = data;
@ -93,6 +100,13 @@ static void update_model(void *data, struct l_dbus_message_iter *variant)
adapter->model = l_strdup(value); adapter->model = l_strdup(value);
} }
static const char *get_model(const void *data)
{
const struct adapter *adapter = data;
return adapter->model;
}
static const char *get_powered_tostr(const void *data) static const char *get_powered_tostr(const void *data)
{ {
const struct adapter *adapter = data; const struct adapter *adapter = data;
@ -119,8 +133,8 @@ static const struct proxy_interface_property adapter_properties[] = {
{ "Powered", "b", update_powered, get_powered_tostr, true, { "Powered", "b", update_powered, get_powered_tostr, true,
properties_builder_append_on_off_variant, properties_builder_append_on_off_variant,
properties_on_off_opts }, properties_on_off_opts },
{ "Vendor", "s", update_vendor }, { "Vendor", "s", update_vendor, get_vendor },
{ "Model", "s", update_model }, { "Model", "s", update_model, get_model },
{ } { }
}; };
@ -129,7 +143,7 @@ static void display_adapter(const struct proxy_interface *proxy)
const struct adapter *adapter = proxy_interface_get_data(proxy); const struct adapter *adapter = proxy_interface_get_data(proxy);
char *caption = l_strdup_printf("%s: %s", "Adapter", adapter->name); char *caption = l_strdup_printf("%s: %s", "Adapter", adapter->name);
proxy_properties_display(proxy, caption, MARGIN, 17, 47); proxy_properties_display(proxy, caption, MARGIN, 17, 50);
l_free(caption); l_free(caption);
@ -140,7 +154,7 @@ static void display_adapter_inline(const char *margin, const void *data)
{ {
const struct adapter *adapter = data; const struct adapter *adapter = data;
display("%s%-*s%-*s%-*s%-*s\n", margin, display("%s%-*s%-*s%-.*s%-.*s\n", margin,
19, adapter->name ? : "-", 10, get_powered_tostr(adapter), 19, adapter->name ? : "-", 10, get_powered_tostr(adapter),
20, adapter->vendor ? : "-", 20, adapter->model ? : "-"); 20, adapter->vendor ? : "-", 20, adapter->model ? : "-");
} }