From d702e037c041c149919a76a1641e45720af60847 Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Fri, 22 Oct 2021 10:47:59 -0500 Subject: [PATCH] main: Simplify away l_dbus_message_builder use Since the dictionary attributes are static, l_dbus_message_set_arguments can be used instead. --- src/main.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/src/main.c b/src/main.c index 3b5f8113..989665e4 100644 --- a/src/main.c +++ b/src/main.c @@ -31,6 +31,8 @@ #include #include +#include + #include "linux/nl80211.h" #include "src/iwd.h" @@ -215,22 +217,15 @@ static struct l_dbus_message *iwd_dbus_get_info(struct l_dbus *dbus, struct l_dbus_message *message, void *user_data) { - struct l_dbus_message *reply; - struct l_dbus_message_builder *builder; - L_AUTO_FREE_VAR(char *, storage_dir) = storage_get_path(NULL); - bool b = netconfig_enabled(); + struct l_dbus_message *reply = + l_dbus_message_new_method_return(message); + _auto_(l_free) char *storage_dir = storage_get_path(NULL); - reply = l_dbus_message_new_method_return(message); - builder = l_dbus_message_builder_new(reply); - l_dbus_message_builder_enter_array(builder, "{sv}"); - - dbus_append_dict_basic(builder, "NetworkConfigurationEnabled", 'b', &b); - dbus_append_dict_basic(builder, "StateDirectory", 's', storage_dir); - dbus_append_dict_basic(builder, "Version", 's', VERSION); - - l_dbus_message_builder_leave_array(builder); - l_dbus_message_builder_finalize(builder); - l_dbus_message_builder_destroy(builder); + l_dbus_message_set_arguments(reply, "a{sv}", 3, + "NetworkConfigurationEnabled", + "b", netconfig_enabled(), + "StateDirectory", "s", storage_dir, + "Version", "s", VERSION); return reply; }