Attachment 132874 Details for Bug 101354 – _dbus_asv_add_object_path: Add

[patch] _dbus_asv_add_object_path: Add

dbusasvaddobjectpath-Add.patch (text/plain), 2.76 KB, created by Simon McVittie on 2017-07-24 19:04:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2017-07-24 19:04:04 UTC

Size: 2.76 KB

patch

obsolete

>From 383a69415b83c74b4d7b89f94fea8929de8e595d Mon Sep 17 00:00:00 2001
>From: Simon McVittie <smcv@collabora.com>
>Date: Fri, 9 Jun 2017 15:57:30 +0100
>Subject: [PATCH] _dbus_asv_add_object_path: Add
>
>Signed-off-by: Simon McVittie <smcv@collabora.com>
>Reviewed-by: Philip Withnall <withnall@endlessm.com>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=101354
>---
> dbus/dbus-asv-util.c | 36 ++++++++++++++++++++++++++++++++++++
> dbus/dbus-asv-util.h |  3 +++
> 2 files changed, 39 insertions(+)
>
>diff --git a/dbus/dbus-asv-util.c b/dbus/dbus-asv-util.c
>index fbb2e51e..09c9fb56 100644
>--- a/dbus/dbus-asv-util.c
>+++ b/dbus/dbus-asv-util.c
>@@ -261,6 +261,42 @@ _dbus_asv_add_string (DBusMessageIter *arr_iter,
> 
> /**
>  * Create a new entry in an a{sv} (map from string to variant)
>+ * with an object-path 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
>+ * @returns #TRUE on success, or #FALSE if not enough memory
>+ */
>+dbus_bool_t
>+_dbus_asv_add_object_path (DBusMessageIter *arr_iter,
>+                           const char *key,
>+                           const char *value)
>+{
>+  DBusMessageIter entry_iter, var_iter;
>+
>+  if (!_dbus_asv_open_entry (arr_iter, &entry_iter, key,
>+                             DBUS_TYPE_OBJECT_PATH_AS_STRING, &var_iter))
>+    return FALSE;
>+
>+  if (!dbus_message_iter_append_basic (&var_iter, DBUS_TYPE_OBJECT_PATH,
>+                                       &value))
>+    {
>+      _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;
>+}
>+
>+/**
>+ * 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
>diff --git a/dbus/dbus-asv-util.h b/dbus/dbus-asv-util.h
>index a439008f..37d94060 100644
>--- a/dbus/dbus-asv-util.h
>+++ b/dbus/dbus-asv-util.h
>@@ -42,6 +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_object_path   (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,
>-- 
>2.13.3

Actions: View | Splinter Review

Attachments on bug 101354: 132165 | 132167 | 132169 | 132170 | 132171 | 132172 | 132173 | 132174 | 132175 | 132176 | 132177 | 132178 | 132179 | 132180 | 132181 | 132182 | 132183 | 132184 | 132185 | 132186 | 132187 | 132188 | 132189 | 132190 | 132191 | 132192 | 132193 | 132194 | 132195 | 132196 | 132197 | 132198 | 132199 | 132200 | 132201 | 132202 | 132203 | 132204 | 132205 | 132206 | 132207 | 132367 | 132368 | 132369 | 132370 | 132373 | 132508 | 132509 | 132510 | 132511 | 132512 | 132513 | 132514 | 132515 | 132516 | 132517 | 132518 | 132519 | 132520 | 132521 | 132522 | 132523 | 132524 | 132525 | 132526 | 132527 | 132528 | 132531 | 132532 | 132534 | 132535 | 132536 | 132537 | 132538 | 132539 | 132540 | 132541 | 132542 | 132543 | 132544 | 132545 | 132546 | 132547 | 132548 | 132549 | 132550 | 132551 | 132552 | 132553 | 132554 | 132555 | 132870 | 132871 | 132872 | 132873 | 132874 | 132875 | 132876 | 132877 | 132878 | 132879 | 132880 | 132881 | 132882 | 132885 | 132886 | 132887 | 132888 | 132891 | 132892 | 132893 | 132894 | 132895 | 132896 | 132897 | 132898 | 132899 | 132900 | 132901 | 132902 | 132903 | 132904 | 132905 | 132906 | 132907 | 132908 | 132909 | 132910 | 132911 | 132912 | 132913 | 132914 | 132915 | 132916 | 132917 | 132918 | 132919 | 132920 | 132921 | 132922 | 132923 | 132924 | 132925 | 132926 | 133003 | 133004 | 133005 | 133006 | 133007 | 133008 | 133009 | 133010 | 133011 | 133012 | 133013 | 133014 | 133015 | 133016 | 133017 | 133018 | 133019 | 133020 | 133021 | 133022 | 133023 | 133024 | 133025 | 133026 | 133027 | 133028 | 133029 | 133030 | 133031 | 133032 | 133033 | 133034 | 133035 | 133036 | 133037 | 133038 | 133039 | 133040 | 133041 | 133042 | 133043 | 133044 | 133045 | 133046 | 133047 | 133048 | 133049 | 133050 | 133051 | 133052 | 133053

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.