typedef struct _GPrivateNSPR GPrivateNSPR;
struct _GPrivateNSPR
{
- PRUintn private;
+ PRUintn private_key;
GDestroyNotify destructor;
};
{
/* we can not use g_new and friends, as they might use private data by
themself */
- GPrivateNSPRData *private = malloc (sizeof (GPrivateNSPRData));
- g_assert (private);
- private->data = data;
- private->destructor = destructor;
+ GPrivateNSPRData *private_key = malloc (sizeof (GPrivateNSPRData));
+ g_assert (private_key);
+ private_key->data = data;
+ private_key->destructor = destructor;
- return private;
+ return private_key;
}
static void
g_private_nspr_data_destructor (gpointer data)
{
- GPrivateNSPRData *private = data;
- if (private->destructor && private->data)
- (*private->destructor) (private->data);
- free (private);
+ GPrivateNSPRData *private_key = data;
+ if (private_key->destructor && private_key->data)
+ (*private_key->destructor) (private_key->data);
+ free (private_key);
}
static GPrivate *
g_private_new_nspr_impl (GDestroyNotify destructor)
{
GPrivateNSPR *result = g_new (GPrivateNSPR, 1);
- PRStatus status = PR_NewThreadPrivateIndex (&result->private,
+ PRStatus status = PR_NewThreadPrivateIndex (&result->private_key,
g_private_nspr_data_destructor);
g_assert (status == PR_SUCCESS);
functions from gmem.c and gmessages.c */
static GPrivateNSPRData *
-g_private_nspr_data_get (GPrivateNSPR * private)
+g_private_nspr_data_get (GPrivateNSPR * private_key)
{
GPrivateNSPRData *data;
- STDERR_ASSERT (private);
+ STDERR_ASSERT (private_key);
- data = PR_GetThreadPrivate (private->private);
+ data = PR_GetThreadPrivate (private_key->private_key);
if (!data)
{
- data = g_private_nspr_data_constructor (private->destructor, NULL);
- STDERR_ASSERT (PR_SetThreadPrivate (private->private, data)
+ data = g_private_nspr_data_constructor (private_key->destructor, NULL);
+ STDERR_ASSERT (PR_SetThreadPrivate (private_key->private_key, data)
== PR_SUCCESS);
}
}
static void
-g_private_set_nspr_impl (GPrivate * private, gpointer value)
+g_private_set_nspr_impl (GPrivate * private_key, gpointer value)
{
- if (!private)
+ if (!private_key)
return;
- g_private_nspr_data_get ((GPrivateNSPR *) private)->data = value;
+ g_private_nspr_data_get ((GPrivateNSPR *) private_key)->data = value;
}
static gpointer
-g_private_get_nspr_impl (GPrivate * private)
+g_private_get_nspr_impl (GPrivate * private_key)
{
- if (!private)
+ if (!private_key)
return NULL;
- return g_private_nspr_data_get ((GPrivateNSPR *) private)->data;
+ return g_private_nspr_data_get ((GPrivateNSPR *) private_key)->data;
}
static GThreadFunctions g_thread_functions_for_glib_use_default =
functions from gmem.c and gmessages.c */
static void
-g_private_set_posix_impl (GPrivate * private, gpointer value)
+g_private_set_posix_impl (GPrivate * private_key, gpointer value)
{
- if (!private)
+ if (!private_key)
return;
- pthread_setspecific (*(pthread_key_t *) private, value);
+ pthread_setspecific (*(pthread_key_t *) private_key, value);
}
static gpointer
-g_private_get_posix_impl (GPrivate * private)
+g_private_get_posix_impl (GPrivate * private_key)
{
- if (!private)
+ if (!private_key)
return NULL;
- return pthread_getspecific (*(pthread_key_t *) private);
+ return pthread_getspecific (*(pthread_key_t *) private_key);
}
static GThreadFunctions g_thread_functions_for_glib_use_default =
functions from gmem.c and gmessages.c */
static void
-g_private_set_solaris_impl (GPrivate * private, gpointer value)
+g_private_set_solaris_impl (GPrivate * private_key, gpointer value)
{
- if (!private)
+ if (!private_key)
return;
- thr_setspecific (*(thread_key_t *) private, value);
+ thr_setspecific (*(thread_key_t *) private_key, value);
}
static gpointer
-g_private_get_solaris_impl (GPrivate * private)
+g_private_get_solaris_impl (GPrivate * private_key)
{
gpointer result;
- if (!private)
+ if (!private_key)
return NULL;
- thr_getspecific (*(thread_key_t *) private, &result);
+ thr_getspecific (*(thread_key_t *) private_key, &result);
return result;
}
g_free (real);
}
-GStaticPrivate private;
+GStaticPrivate private_key;
void
test_private_func (void *data)
while (i < TEST_PRIVATE_ROUNDS)
{
guint random_value = rand () % 10000;
- guint *data = g_static_private_get (&private);
+ guint *data = g_static_private_get (&private_key);
if (!data)
{
data = private_constructor ();
- g_static_private_set (&private, data, private_destructor);
+ g_static_private_set (&private_key, data, private_destructor);
}
*data = random_value;
wait_thread (.2);
- g_assert (*(guint *) g_static_private_get (&private) == random_value);
+ g_assert (*(guint *) g_static_private_get (&private_key) == random_value);
i++;
}
}