luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-12-15 12:58:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

repo: Drop deprecated GStaticMutex usage

Browse Source 
In favor of GOnce, since we just want initialize-once semantics.
This commit is contained in:
Colin Walters
2012-12-17 09:50:28 -05:00
parent 430826e825
commit 35091ec7df
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
girepository.c
View File

@@ -35,7 +35,6 @@
#include "config.h" #include "config.h"
static GStaticMutex globals_lock = G_STATIC_MUTEX_INIT;
static GIRepository *default_repository = NULL; static GIRepository *default_repository = NULL;
static GSList *search_path = NULL; static GSList *search_path = NULL;
static GSList *override_search_path = NULL; static GSList *override_search_path = NULL;
@@ -134,12 +133,13 @@ g_irepository_class_init (GIRepositoryClass *class)
static void static void
init_globals (void) init_globals (void)
{ {
g_static_mutex_lock (&globals_lock); static gsize initialized = 0;
if (!g_once_init_enter (&initialized))
return;
if (default_repository == NULL) if (default_repository == NULL)
{
default_repository = g_object_new (G_TYPE_IREPOSITORY, NULL); default_repository = g_object_new (G_TYPE_IREPOSITORY, NULL);
}
if (search_path == NULL) if (search_path == NULL)
{ {
@@ -184,7 +184,7 @@ init_globals (void)
search_path = g_slist_reverse (search_path); search_path = g_slist_reverse (search_path);
} }
g_static_mutex_unlock (&globals_lock); g_once_init_leave (&initialized, 1);
} }
void void