Commit c966d903 authored by Tyler Hicks's avatar Tyler Hicks Committed by Simon McVittie

New a{sv} helper for using byte arrays as the variant

Create a new helper for using a byte array as the value in the mapping
from string to variant.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=75113
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=89041Signed-off-by: default avatarTyler Hicks <tyhicks@canonical.com>
Reviewed-by: default avatarSimon McVittie <simon.mcvittie@collabora.co.uk>
Reviewed-by: Philip Withnall's avatarPhilip Withnall <philip.withnall@collabora.co.uk>
parent 387c1a5b
......@@ -258,3 +258,57 @@ _dbus_asv_add_string (DBusMessageIter *arr_iter,
return TRUE;
}
/**
* Create a new entry in an a{sv} (map from string to variant)
* with a byte array value.
*
* If this function fails, the a{sv} must be abandoned, for instance
* with _dbus_asv_abandon().
*
* @param arr_iter the iterator which is appending to the array
* @param key a UTF-8 key for the map
* @param value the value
* @param n_elements the number of elements to append
* @returns #TRUE on success, or #FALSE if not enough memory
*/
dbus_bool_t
_dbus_asv_add_byte_array (DBusMessageIter *arr_iter,
const char *key,
const void *value,
int n_elements)
{
DBusMessageIter entry_iter;
DBusMessageIter var_iter;
DBusMessageIter byte_array_iter;
if (!_dbus_asv_open_entry (arr_iter, &entry_iter, key, "ay", &var_iter))
return FALSE;
if (!dbus_message_iter_open_container (&var_iter, DBUS_TYPE_ARRAY,
DBUS_TYPE_BYTE_AS_STRING,
&byte_array_iter))
{
_dbus_asv_abandon_entry (arr_iter, &entry_iter, &var_iter);
return FALSE;
}
if (!dbus_message_iter_append_fixed_array (&byte_array_iter, DBUS_TYPE_BYTE,
&value, n_elements))
{
dbus_message_iter_abandon_container (&var_iter, &byte_array_iter);
_dbus_asv_abandon_entry (arr_iter, &entry_iter, &var_iter);
return FALSE;
}
if (!dbus_message_iter_close_container (&var_iter, &byte_array_iter))
{
_dbus_asv_abandon_entry (arr_iter, &entry_iter, &var_iter);
return FALSE;
}
if (!_dbus_asv_close_entry (arr_iter, &entry_iter, &var_iter))
return FALSE;
return TRUE;
}
......@@ -42,5 +42,9 @@ dbus_bool_t _dbus_asv_add_uint32 (DBusMessageIter *arr_iter,
dbus_bool_t _dbus_asv_add_string (DBusMessageIter *arr_iter,
const char *key,
const char *value);
dbus_bool_t _dbus_asv_add_byte_array (DBusMessageIter *arr_iter,
const char *key,
const void *value,
int n_elements);
#endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment