luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-02 07:23:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Bug 624473: GDBusSubtreeIntrospectFunc return type

Browse Source 
Return a NULL terminated C array instead of a GPtrArray

Also, document that %NULL is a permitted return value and clarify its
meaning.

Finally, avoid calling the enumeration function during dispatch when the
G_DBUS_SUBTREE_FLAGS_DISPATCH_TO_UNENUMERATED_NODES flag was given.
This commit is contained in:
Ryan Lortie
2010-07-15 16:26:42 -04:00
parent 48b1fe948c
commit e6b5546cf5
3 changed files with 74 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
gio/tests/gdbus-export.c
View File

@@ -614,37 +614,38 @@ subtree_enumerate (GDBusConnection *connection,
}
/* Only allows certain objects, and aborts on unknowns */
static GPtrArray *
static GDBusInterfaceInfo **
subtree_introspect (GDBusConnection *connection,
const gchar *sender,
const gchar *object_path,
const gchar *node,
gpointer user_data)
{
GPtrArray *interfaces;
const GDBusInterfaceInfo *interfaces[2] = {
NULL /* filled in below */, NULL
};
/* VPs implement the Foo interface, EVPs implement the Bar interface. The root
* does not implement any interfaces
*/
interfaces = g_ptr_array_new ();
if (g_str_has_prefix (node, "vp"))
{
g_ptr_array_add (interfaces, (gpointer) &foo_interface_info);
interfaces[0] = &foo_interface_info;
}
else if (g_str_has_prefix (node, "evp"))
{
g_ptr_array_add (interfaces, (gpointer) &bar_interface_info);
interfaces[0] = &bar_interface_info;
}
else if (g_strcmp0 (node, "/") == 0)
{
/* do nothing */
return NULL;
}
else
{
g_assert_not_reached ();
}
return interfaces;
return g_memdup (interfaces, 2 * sizeof (void *));
}
static const GDBusInterfaceVTable *
@@ -691,20 +692,16 @@ dynamic_subtree_enumerate (GDBusConnection *connection,
}
/* Allow all objects to be introspected */
static GPtrArray *
static GDBusInterfaceInfo **
dynamic_subtree_introspect (GDBusConnection *connection,
const gchar *sender,
const gchar *object_path,
const gchar *node,
gpointer user_data)
{
GPtrArray *interfaces;
const GDBusInterfaceInfo *interfaces[2] = { &dyna_interface_info, NULL };
/* All nodes (including the root node) implements the Dyna interface */
interfaces = g_ptr_array_new ();
g_ptr_array_add (interfaces, (gpointer) &dyna_interface_info);
return interfaces;
return g_memdup (interfaces, 2 * sizeof (void *));
}
static const GDBusInterfaceVTable *