---
tools/obexctl.c | 36 ++----------------------------------
1 file changed, 2 insertions(+), 34 deletions(-)
diff --git a/tools/obexctl.c b/tools/obexctl.c
index c62ae8711..9af2a925e 100644
--- a/tools/obexctl.c
+++ b/tools/obexctl.c
@@ -123,39 +123,6 @@ static void connect_reply(DBusMessage *message, void *user_data)
return bt_shell_noninteractive_quit(EXIT_SUCCESS);
}
-static void append_variant(DBusMessageIter *iter, int type, void *val)
-{
- DBusMessageIter value;
- char sig[2] = { type, '\0' };
-
- dbus_message_iter_open_container(iter, DBUS_TYPE_VARIANT, sig, &value);
-
- dbus_message_iter_append_basic(&value, type, val);
-
- dbus_message_iter_close_container(iter, &value);
-}
-
-static void dict_append_entry(DBusMessageIter *dict, const char *key,
- int type, void *val)
-{
- DBusMessageIter entry;
-
- if (type == DBUS_TYPE_STRING) {
- const char *str = *((const char **) val);
- if (str == NULL)
- return;
- }
-
- dbus_message_iter_open_container(dict, DBUS_TYPE_DICT_ENTRY,
- NULL, &entry);
-
- dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &key);
-
- append_variant(&entry, type, val);
-
- dbus_message_iter_close_container(dict, &entry);
-}
-
struct connect_args {
char *dev;
char *target;
@@ -187,7 +154,8 @@ static void connect_setup(DBusMessageIter *iter, void *user_data)
if (args->target == NULL)
goto done;
- dict_append_entry(&dict, "Target", DBUS_TYPE_STRING, &args->target);
+ g_dbus_dict_append_entry(&dict, "Target",
+ DBUS_TYPE_STRING, &args->target);
done:
dbus_message_iter_close_container(iter, &dict);
--
2.14.1
--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
