Use inline functions for dictionary helpers

1 files changed, 32 insertions, 6 deletions

diff --git a/include/dbus.h b/include/dbus.h
index 2b75d364..3757fef8 100644
--- a/include/dbus.h
+++ b/include/dbus.h
@@ -70,13 +70,39 @@ static inline void connman_dbus_dict_close(DBusMessageIter *iter,
 	dbus_message_iter_close_container(iter, dict);
 }
 
-void connman_dbus_dict_append_variant(DBusMessageIter *dict,
-					const char *key, int type, void *val);
+static inline void connman_dbus_dict_append_variant(DBusMessageIter *dict,
+					const char *key, int type, void *val)
+{
+	DBusMessageIter entry;
 
-void connman_dbus_dict_append_fixed_array(DBusMessageIter *dict,
-				const char *key, int type, void *val, int len);
-void connman_dbus_dict_append_variable_array(DBusMessageIter *dict,
-		const char *key, int type, connman_dbus_append_cb_t function);
+	dbus_message_iter_open_container(dict, DBUS_TYPE_DICT_ENTRY,
+								NULL, &entry);
+	connman_dbus_property_append_variant(&entry, key, type, val);
+	dbus_message_iter_close_container(dict, &entry);
+}
+
+static inline void connman_dbus_dict_append_fixed_array(DBusMessageIter *dict,
+				const char *key, int type, void *val, int len)
+{
+	DBusMessageIter entry;
+
+	dbus_message_iter_open_container(dict, DBUS_TYPE_DICT_ENTRY,
+								NULL, &entry);
+	connman_dbus_property_append_fixed_array(&entry, key, type, val, len);
+	dbus_message_iter_close_container(dict, &entry);
+}
+
+static inline void connman_dbus_dict_append_variable_array(DBusMessageIter *dict,
+		const char *key, int type, connman_dbus_append_cb_t function)
+{
+	DBusMessageIter entry;
+
+	dbus_message_iter_open_container(dict, DBUS_TYPE_DICT_ENTRY,
+								NULL, &entry);
+	connman_dbus_property_append_variable_array(&entry, key,
+							type, function);
+	dbus_message_iter_close_container(dict, &entry);
+}
 
 dbus_bool_t connman_dbus_validate_ident(const char *ident);
 char *connman_dbus_encode_string(const char *value);