Use g_once_init_{enter,leave}_pointer where appropriate

This should not result in any functional changes, but will eventually
allow glib to be functional on CHERI-enabled systems such as Morello.

Helps: https://gitlab.gnome.org/GNOME/glib/-/issues/2842
This commit is contained in:
Alex Richardson
2023-09-11 23:59:52 -07:00
committed by Philip Withnall
parent 726eca7c89
commit a1dfecf11f
25 changed files with 81 additions and 86 deletions

View File

@@ -336,7 +336,7 @@ g_resource_find_overlay (const gchar *path,
* we can take a bit more time...
*/
if (g_once_init_enter (&overlay_dirs))
if (g_once_init_enter_pointer (&overlay_dirs))
{
gboolean is_setuid = GLIB_PRIVATE_CALL (g_check_setuid) ();
const gchar * const *result;
@@ -420,7 +420,7 @@ g_resource_find_overlay (const gchar *path,
result = empty_strv;
}
g_once_init_leave (&overlay_dirs, result);
g_once_init_leave_pointer (&overlay_dirs, result);
}
for (i = 0; overlay_dirs[i]; i++)