luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-10 03:16:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

gdbusconnection: Use g_strv_contains() rather than a home-grown version

Browse Source 
The public `g_strv_contains()` API didn’t exist at the time this code
was originally written. Now, happily, it does.

Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
This commit is contained in:
Philip Withnall 2022-03-17 16:24:08 +00:00
parent 9b77b75f2d
commit e4d77f7e89
1 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gio/gdbusconnection.c
View File

@ -282,22 +282,6 @@ call_destroy_notify (GMainContext *context,
/* ---------------------------------------------------------------------------------------------------- */ /* ---------------------------------------------------------------------------------------------------- */
static gboolean
_g_strv_has_string (const gchar* const *haystack,
const gchar *needle)
{
guint n;
for (n = 0; haystack != NULL && haystack[n] != NULL; n++)
{
if (g_strcmp0 (haystack[n], needle) == 0)
return TRUE;
}
return FALSE;
}
/* ---------------------------------------------------------------------------------------------------- */
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
#define CONNECTION_ENSURE_LOCK(obj) do { ; } while (FALSE) #define CONNECTION_ENSURE_LOCK(obj) do { ; } while (FALSE)
#else #else
@ -6544,7 +6528,7 @@ handle_subtree_introspect (GDBusConnection *connection,
/* Assert existence of object if we are not dynamic */ /* Assert existence of object if we are not dynamic */
if (!(es->flags & G_DBUS_SUBTREE_FLAGS_DISPATCH_TO_UNENUMERATED_NODES) && if (!(es->flags & G_DBUS_SUBTREE_FLAGS_DISPATCH_TO_UNENUMERATED_NODES) &&
!_g_strv_has_string ((const gchar * const *) children, requested_node)) !g_strv_contains ((const gchar * const *) children, requested_node))
goto out; goto out;
} }
else else
@ -6675,7 +6659,7 @@ handle_subtree_method_invocation (GDBusConnection *connection,
es->object_path, es->object_path,
es->user_data); es->user_data);
exists = _g_strv_has_string ((const gchar * const *) children, requested_node); exists = g_strv_contains ((const gchar * const *) children, requested_node);
g_strfreev (children); g_strfreev (children);
if (!exists) if (!exists)