diff --git a/src/dbus.c b/src/dbus.c index 66caa093..361d416f 100644 --- a/src/dbus.c +++ b/src/dbus.c @@ -43,58 +43,6 @@ static void do_debug(const char *str, void *user_data) l_info("%s%s", prefix, str); } -void dbus_dict_append_string(struct l_dbus_message_builder *builder, - const char *key, const char *strval) -{ - l_dbus_message_builder_enter_dict(builder, "sv"); - l_dbus_message_builder_append_basic(builder, 's', key); - l_dbus_message_builder_enter_variant(builder, "s"); - l_dbus_message_builder_append_basic(builder, 's', strval); - l_dbus_message_builder_leave_variant(builder); - l_dbus_message_builder_leave_dict(builder); -} - -void dbus_dict_append_bool(struct l_dbus_message_builder *builder, - const char *key, bool boolval) -{ - l_dbus_message_builder_enter_dict(builder, "sv"); - l_dbus_message_builder_append_basic(builder, 's', key); - l_dbus_message_builder_enter_variant(builder, "b"); - l_dbus_message_builder_append_basic(builder, 'b', &boolval); - l_dbus_message_builder_leave_variant(builder); - l_dbus_message_builder_leave_dict(builder); -} - -void dbus_dict_append_object(struct l_dbus_message_builder *builder, - const char *key, const char *object_path) -{ - l_dbus_message_builder_enter_dict(builder, "sv"); - l_dbus_message_builder_append_basic(builder, 's', key); - l_dbus_message_builder_enter_variant(builder, "o"); - l_dbus_message_builder_append_basic(builder, 'o', object_path); - l_dbus_message_builder_leave_variant(builder); - l_dbus_message_builder_leave_dict(builder); -} - -void dbus_dict_append_bytearray(struct l_dbus_message_builder *builder, - const char *key, const uint8_t *arrayval, - const int len) -{ - int i; - - l_dbus_message_builder_enter_dict(builder, "sv"); - l_dbus_message_builder_append_basic(builder, 's', key); - l_dbus_message_builder_enter_variant(builder, "ay"); - l_dbus_message_builder_enter_array(builder, "y"); - - for (i = 0; i < len; i++) - l_dbus_message_builder_append_basic(builder, 'y', &arrayval[i]); - - l_dbus_message_builder_leave_array(builder); - l_dbus_message_builder_leave_variant(builder); - l_dbus_message_builder_leave_dict(builder); -} - struct l_dbus_message *dbus_error_busy(struct l_dbus_message *msg) { return l_dbus_message_new_error(msg, IWD_SERVICE ".InProgress", diff --git a/src/dbus.h b/src/dbus.h index b6aab56e..b46b1f84 100644 --- a/src/dbus.h +++ b/src/dbus.h @@ -44,16 +44,6 @@ struct l_dbus *dbus_get_bus(void); void dbus_pending_reply(struct l_dbus_message **msg, struct l_dbus_message *reply); -void dbus_dict_append_string(struct l_dbus_message_builder *builder, - const char *key, const char *strval); -void dbus_dict_append_bool(struct l_dbus_message_builder *builder, - const char *key, bool boolval); -void dbus_dict_append_object(struct l_dbus_message_builder *builder, - const char *key, const char *object_path); -void dbus_dict_append_bytearray(struct l_dbus_message_builder *builder, - const char *key, const uint8_t *arrayval, - const int len); - struct l_dbus_message *dbus_error_busy(struct l_dbus_message *msg); struct l_dbus_message *dbus_error_failed(struct l_dbus_message *msg); struct l_dbus_message *dbus_error_aborted(struct l_dbus_message *msg);