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

GPrivate: change return type of internal function

Browse Source 
g_private_get_impl() was returning a pointer to the pthread_key_t, but every
function using this was immediately dereferencing it.  Change it so that we
dereference the value in the helper function and return it by value.

https://bugzilla.gnome.org/show_bug.cgi?id=737445
This commit is contained in:
Allison Karlitskaya 2023-07-21 17:03:31 +01:00 committed by Philip Withnall
parent 9cb52d9f3b
commit 256b195ff1
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
glib/gthread-posix.c
View File

@ -1047,7 +1047,7 @@ g_private_impl_free (pthread_key_t *key)
free (key);
}
static inline pthread_key_t *
static inline pthread_key_t
g_private_get_impl (GPrivate *key)
{
pthread_key_t *impl = g_atomic_pointer_get (&key->p);
@ -1062,7 +1062,7 @@ g_private_get_impl (GPrivate *key)
}
}
return impl;
return *impl;
}
/**
@ -1081,7 +1081,7 @@ gpointer
g_private_get (GPrivate *key)
{
/* quote POSIX: No errors are returned from pthread_getspecific(). */
return pthread_getspecific (*g_private_get_impl (key));
return pthread_getspecific (g_private_get_impl (key));
}
/**
@ -1101,7 +1101,7 @@ g_private_set (GPrivate *key,
{
gint status;
if G_UNLIKELY ((status = pthread_setspecific (*g_private_get_impl (key), value)) != 0)
if G_UNLIKELY ((status = pthread_setspecific (g_private_get_impl (key), value)) != 0)
g_thread_abort (status, "pthread_setspecific");
}
@ -1123,13 +1123,13 @@ void
g_private_replace (GPrivate *key,
gpointer value)
{
pthread_key_t *impl = g_private_get_impl (key);
pthread_key_t impl = g_private_get_impl (key);
gpointer old;
gint status;
old = pthread_getspecific (*impl);
old = pthread_getspecific (impl);
if G_UNLIKELY ((status = pthread_setspecific (*impl, value)) != 0)
if G_UNLIKELY ((status = pthread_setspecific (impl, value)) != 0)
g_thread_abort (status, "pthread_setspecific");
if (old && key->notify)