diff options
author | Marcel Holtmann <marcel@holtmann.org> | 2009-12-19 12:12:49 -0800 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2009-12-19 12:12:49 -0800 |
commit | 002f7173b8db3b7ec06940521e8bae35b9243fda (patch) | |
tree | 8f901a2fe9d1a33070957d8b09d802a298f6aebb /include/dbus.h | |
parent | 6f3c263d0724911ca629b42becca229d49f605dc (diff) | |
download | connman-002f7173b8db3b7ec06940521e8bae35b9243fda.tar.gz connman-002f7173b8db3b7ec06940521e8bae35b9243fda.tar.bz2 connman-002f7173b8db3b7ec06940521e8bae35b9243fda.zip |
Use inline functions for dictionary helpers
Diffstat (limited to 'include/dbus.h')
-rw-r--r-- | include/dbus.h | 38 |
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); |