From 002f7173b8db3b7ec06940521e8bae35b9243fda Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Sat, 19 Dec 2009 12:12:49 -0800 Subject: [PATCH] Use inline functions for dictionary helpers --- include/dbus.h | 38 ++++++++++++++++++++++++++++++++------ src/dbus.c | 40 ---------------------------------------- 2 files changed, 32 insertions(+), 46 deletions(-) diff --git a/include/dbus.h b/include/dbus.h index 2b75d36..3757fef 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); diff --git a/src/dbus.c b/src/dbus.c index e1189fe..7308a49 100644 --- a/src/dbus.c +++ b/src/dbus.c @@ -179,46 +179,6 @@ void connman_dbus_property_append_variable_array(DBusMessageIter *iter, dbus_message_iter_close_container(iter, &value); } -void connman_dbus_dict_append_variant(DBusMessageIter *dict, - const char *key, int type, void *val) -{ - DBusMessageIter entry; - - 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); -} - -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); -} - -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); -} - static DBusConnection *connection = NULL; DBusConnection *connman_dbus_get_connection(void) -- 2.7.4