Attachment 113356 Details for Bug 89041 – [1/4] New a{sv} helper for using byte arrays as the variant

[patch] [1/4] New a{sv} helper for using byte arrays as the variant

0002-New-a-sv-helper-for-using-byte-arrays-as-the-variant.patch (text/plain), 3.37 KB, created by Simon McVittie on 2015-02-11 14:18:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2015-02-11 14:18:26 UTC

Size: 3.37 KB

patch

obsolete

>From ab5f03e974750696ecd9f47c7e04f0f179062bb3 Mon Sep 17 00:00:00 2001
>From: Tyler Hicks <tyhicks@canonical.com>
>Date: Thu, 13 Mar 2014 17:37:38 -0500
>Subject: [PATCH 2/5] 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=89041
>Signed-off-by: Tyler Hicks <tyhicks@canonical.com>
>Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
>---
> dbus/dbus-asv-util.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++
> dbus/dbus-asv-util.h |  4 ++++
> 2 files changed, 58 insertions(+)
>
>diff --git a/dbus/dbus-asv-util.c b/dbus/dbus-asv-util.c
>index 583e41f..d3ac5e9 100644
>--- a/dbus/dbus-asv-util.c
>+++ b/dbus/dbus-asv-util.c
>@@ -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;
>+}
>diff --git a/dbus/dbus-asv-util.h b/dbus/dbus-asv-util.h
>index 0337260..277ab80 100644
>--- a/dbus/dbus-asv-util.h
>+++ b/dbus/dbus-asv-util.h
>@@ -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
>-- 
>2.1.4
>

Actions: View | Splinter Review

Attachments on bug 89041: 113355 | 113356 | 113357 | 113358 | 113359 | 113372 | 113373 | 113407

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.