gdbus: Simplify code for appending properties

This reuse append_properties for GetAll and GetManagedObjects

diff --git a/gdbus/object.c b/gdbus/object.c
index 30c1a5b..f4f46c4 100644 (file)
--- a/gdbus/object.c
+++ b/gdbus/object.c
@@ -784,9 +784,8 @@ static DBusMessage *properties_get_all(DBusConnection *connection,
 {
        struct generic_data *data = user_data;
        struct interface_data *iface;
-       const GDBusPropertyTable *p;
        const char *interface;
-       DBusMessageIter iter, dict;
+       DBusMessageIter iter;
        DBusMessage *reply;
 
        if (!dbus_message_get_args(message, NULL,
@@ -804,37 +803,8 @@ static DBusMessage *properties_get_all(DBusConnection *connection,
                return NULL;
 
        dbus_message_iter_init_append(reply, &iter);
-       dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY,
-                       DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING
-                       DBUS_TYPE_STRING_AS_STRING DBUS_TYPE_VARIANT_AS_STRING
-                       DBUS_DICT_ENTRY_END_CHAR_AS_STRING, &dict);
-
-       for (p = iface->properties; p && p->name; p++) {
-               DBusMessageIter entry, value;
-
-               if (p->get == NULL)
-                       continue;
-
-               if (p->exists != NULL && !p->exists(p, iface->user_data))
-                       continue;
-
-               dbus_message_iter_open_container(&dict, DBUS_TYPE_DICT_ENTRY,
-                                                               NULL, &entry);
-               dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING,
-                                                               p->name);
-               dbus_message_iter_open_container(&entry, DBUS_TYPE_VARIANT,
-                                                       p->type, &value);
-
-               if (!p->get(p, &value, iface->user_data)) {
-                       dbus_message_unref(reply);
-                       return NULL;
-               }
-
-               dbus_message_iter_close_container(&entry, &value);
-               dbus_message_iter_close_container(&dict, &entry);
-       }
 
-       dbus_message_iter_close_container(&iter, &dict);
+       append_properties(iface, &iter);
 
        return reply;
 }