Commit e75e9c30 authored by Allison Karlitskaya's avatar Allison Karlitskaya

Rename g_thread_try to g_thread_try_new

parent 4417e77f
......@@ -591,7 +591,7 @@ GThreadError
GThread
GThreadFunc
g_thread_new
g_thread_try
g_thread_try_new
g_thread_ref
g_thread_unref
g_thread_join
......
......@@ -1102,7 +1102,7 @@ g_thread_new
g_thread_ref
g_thread_self
g_thread_set_priority
g_thread_try
g_thread_try_new
g_thread_use_default_impl
g_thread_unref
g_thread_yield
......
......@@ -422,8 +422,8 @@
* GThread:
*
* The #GThread struct represents a running thread. This struct
* is returned by g_thread_new() or g_thread_try(). You can obtain the
* #GThread struct representing the current thead by calling
* is returned by g_thread_new() or g_thread_try_new(). You can obtain
* the #GThread struct representing the current thead by calling
* g_thread_self().
*
* The structure is opaque -- none of its fields may be directly
......@@ -435,7 +435,7 @@
* @data: data passed to the thread
*
* Specifies the type of the @func functions passed to g_thread_new() or
* g_thread_try().
* g_thread_try_new().
*
* Returns: the return value of the thread
*/
......@@ -742,7 +742,7 @@ g_thread_proxy (gpointer data)
* 16 bytes.
*
* If the thread can not be created the program aborts. See
* g_thread_try() if you want to attempt to deal with failures.
* g_thread_try_new() if you want to attempt to deal with failures.
*
* Returns: the new #GThread
*
......@@ -765,7 +765,7 @@ g_thread_new (const gchar *name,
}
/**
* g_thread_try:
* g_thread_try_new:
* @name: a name for the new thread
* @func: a function to execute in the new thread
* @data: an argument to supply to the new thread
......@@ -782,10 +782,10 @@ g_thread_new (const gchar *name,
* Since: 2.32
*/
GThread *
g_thread_try (const gchar *name,
GThreadFunc func,
gpointer data,
GError **error)
g_thread_try_new (const gchar *name,
GThreadFunc func,
gpointer data,
GError **error)
{
return g_thread_new_internal (name, g_thread_proxy, func, data, 0, error);
}
......
......@@ -142,7 +142,7 @@ void g_thread_unref (GThread *thread);
GThread * g_thread_new (const gchar *name,
GThreadFunc func,
gpointer data);
GThread * g_thread_try (const gchar *name,
GThread * g_thread_try_new (const gchar *name,
GThreadFunc func,
gpointer data,
GError **error);
......
......@@ -414,7 +414,7 @@ g_thread_pool_start_thread (GRealThreadPool *pool,
GThread *thread;
/* No thread was found, we have to start a new one */
thread = g_thread_try ("pool", g_thread_pool_thread_proxy, pool, error);
thread = g_thread_try_new ("pool", g_thread_pool_thread_proxy, pool, error);
if (thread == NULL)
return FALSE;
......
......@@ -50,7 +50,7 @@ test_thread1 (void)
GThread *thread;
GError *error = NULL;
thread = g_thread_try ("test", thread1_func, NULL, &error);
thread = g_thread_try_new ("test", thread1_func, NULL, &error);
g_assert_no_error (error);
result = g_thread_join (thread);
......@@ -135,7 +135,7 @@ test_thread4 (void)
g_error ("prlimit failed: %s\n", g_strerror (ret));
error = NULL;
thread = g_thread_try ("a", thread1_func, NULL, &error);
thread = g_thread_try_new ("a", thread1_func, NULL, &error);
g_assert (thread == NULL);
g_assert_error (error, G_THREAD_ERROR, G_THREAD_ERROR_AGAIN);
g_error_free (error);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment