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

Replace static privates by privates

Browse Source 
GStaticPrivate is heading for deprecation soon, and GPrivate
can replace these uses now.
This commit is contained in:
Matthias Clasen 2011-10-02 21:57:40 -04:00
parent 6f71151823
commit 34ce4dd032
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gio/gcancellable.c
View File

@ -57,7 +57,7 @@ static guint signals[LAST_SIGNAL] = { 0 };
G_DEFINE_TYPE (GCancellable, g_cancellable, G_TYPE_OBJECT); G_DEFINE_TYPE (GCancellable, g_cancellable, G_TYPE_OBJECT);
static GStaticPrivate current_cancellable = G_STATIC_PRIVATE_INIT; static GPrivate current_cancellable;
G_LOCK_DEFINE_STATIC(cancellable); G_LOCK_DEFINE_STATIC(cancellable);
static GCond *cancellable_cond = NULL; static GCond *cancellable_cond = NULL;
@ -201,9 +201,9 @@ g_cancellable_push_current (GCancellable *cancellable)
g_return_if_fail (cancellable != NULL); g_return_if_fail (cancellable != NULL);
l = g_static_private_get (&current_cancellable); l = g_private_get (&current_cancellable);
l = g_slist_prepend (l, cancellable); l = g_slist_prepend (l, cancellable);
g_static_private_set (&current_cancellable, l, NULL); g_private_set (&current_cancellable, l);
} }
/** /**
@ -218,13 +218,13 @@ g_cancellable_pop_current (GCancellable *cancellable)
{ {
GSList *l; GSList *l;
l = g_static_private_get (&current_cancellable); l = g_private_get (&current_cancellable);
g_return_if_fail (l != NULL); g_return_if_fail (l != NULL);
g_return_if_fail (l->data == cancellable); g_return_if_fail (l->data == cancellable);
l = g_slist_delete_link (l, l); l = g_slist_delete_link (l, l);
g_static_private_set (&current_cancellable, l, NULL); g_private_set (&current_cancellable, l);
} }
/** /**
@ -240,7 +240,7 @@ g_cancellable_get_current (void)
{ {
GSList *l; GSList *l;
l = g_static_private_get (&current_cancellable); l = g_private_get (&current_cancellable);
if (l == NULL) if (l == NULL)
return NULL; return NULL;

6
glib/gutf8.c
View File

@ -587,14 +587,14 @@ charset_cache_free (gpointer data)
gboolean gboolean
g_get_charset (const char **charset) g_get_charset (const char **charset)
{ {
static GStaticPrivate cache_private = G_STATIC_PRIVATE_INIT; static GPrivate cache_private = G_PRIVATE_INIT (charset_cache_free);
GCharsetCache *cache = g_static_private_get (&cache_private); GCharsetCache *cache = g_private_get (&cache_private);
const gchar *raw; const gchar *raw;
if (!cache) if (!cache)
{ {
cache = g_new0 (GCharsetCache, 1); cache = g_new0 (GCharsetCache, 1);
g_static_private_set (&cache_private, cache, charset_cache_free); g_private_set (&cache_private, cache);
} }
G_LOCK (aliases); G_LOCK (aliases);

6
gmodule/gmodule.c
View File

@ -91,7 +91,7 @@ static inline GModule* g_module_find_by_name (const gchar *name);
/* --- variables --- */ /* --- variables --- */
static GModule *modules = NULL; static GModule *modules = NULL;
static GModule *main_module = NULL; static GModule *main_module = NULL;
static GStaticPrivate module_error_private = G_STATIC_PRIVATE_INIT; static GPrivate module_error_private = G_PRIVATE_INIT (g_free);
static gboolean module_debug_initialized = FALSE; static gboolean module_debug_initialized = FALSE;
static guint module_debug_flags = 0; static guint module_debug_flags = 0;
@ -135,7 +135,7 @@ g_module_find_by_name (const gchar *name)
static inline void static inline void
g_module_set_error_unduped (gchar *error) g_module_set_error_unduped (gchar *error)
{ {
g_static_private_set (&module_error_private, error, g_free); g_private_replace (&module_error_private, error);
errno = 0; errno = 0;
} }
@ -600,7 +600,7 @@ g_module_make_resident (GModule *module)
const gchar * const gchar *
g_module_error (void) g_module_error (void)
{ {
return g_static_private_get (&module_error_private); return g_private_get (&module_error_private);
} }
gboolean gboolean