From 3ca18629b00857a6d8e6ebf04da58300bd7e0860 Mon Sep 17 00:00:00 2001 From: Sebastian Wilhelmi Date: Tue, 5 Sep 2000 08:58:20 +0000 Subject: [PATCH] Don't use a G_LOCK, as it isn't necessary. 2000-09-05 Sebastian Wilhelmi * gthread.c (g_thread_error_quark): Don't use a G_LOCK, as it isn't necessary. --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-12 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ glib/gthread.c | 8 +------- gthread.c | 8 +------- 10 files changed, 42 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1c63c85b0..e7af6f6e7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2000-09-05 Sebastian Wilhelmi + + * gthread.c (g_thread_error_quark): Don't use a G_LOCK, as it + isn't necessary. + 2000-09-01 Sebastian Wilhelmi * gstring.c (g_string_free): Use g_return_val_if_fail instead of diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 1c63c85b0..e7af6f6e7 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +2000-09-05 Sebastian Wilhelmi + + * gthread.c (g_thread_error_quark): Don't use a G_LOCK, as it + isn't necessary. + 2000-09-01 Sebastian Wilhelmi * gstring.c (g_string_free): Use g_return_val_if_fail instead of diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 1c63c85b0..e7af6f6e7 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2000-09-05 Sebastian Wilhelmi + + * gthread.c (g_thread_error_quark): Don't use a G_LOCK, as it + isn't necessary. + 2000-09-01 Sebastian Wilhelmi * gstring.c (g_string_free): Use g_return_val_if_fail instead of diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 1c63c85b0..e7af6f6e7 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +2000-09-05 Sebastian Wilhelmi + + * gthread.c (g_thread_error_quark): Don't use a G_LOCK, as it + isn't necessary. + 2000-09-01 Sebastian Wilhelmi * gstring.c (g_string_free): Use g_return_val_if_fail instead of diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 1c63c85b0..e7af6f6e7 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +2000-09-05 Sebastian Wilhelmi + + * gthread.c (g_thread_error_quark): Don't use a G_LOCK, as it + isn't necessary. + 2000-09-01 Sebastian Wilhelmi * gstring.c (g_string_free): Use g_return_val_if_fail instead of diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 1c63c85b0..e7af6f6e7 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +2000-09-05 Sebastian Wilhelmi + + * gthread.c (g_thread_error_quark): Don't use a G_LOCK, as it + isn't necessary. + 2000-09-01 Sebastian Wilhelmi * gstring.c (g_string_free): Use g_return_val_if_fail instead of diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 1c63c85b0..e7af6f6e7 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2000-09-05 Sebastian Wilhelmi + + * gthread.c (g_thread_error_quark): Don't use a G_LOCK, as it + isn't necessary. + 2000-09-01 Sebastian Wilhelmi * gstring.c (g_string_free): Use g_return_val_if_fail instead of diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 1c63c85b0..e7af6f6e7 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2000-09-05 Sebastian Wilhelmi + + * gthread.c (g_thread_error_quark): Don't use a G_LOCK, as it + isn't necessary. + 2000-09-01 Sebastian Wilhelmi * gstring.c (g_string_free): Use g_return_val_if_fail instead of diff --git a/glib/gthread.c b/glib/gthread.c index 654138f6f..034e7716d 100644 --- a/glib/gthread.c +++ b/glib/gthread.c @@ -55,14 +55,8 @@ GQuark g_thread_error_quark() { static GQuark quark; - G_LOCK_DEFINE_STATIC(lock); if (!quark) - { - G_LOCK (lock); - if (!quark) - quark = g_quark_from_static_string ("g-thread-error"); - G_UNLOCK (lock); - } + quark = g_quark_from_static_string ("g_thread_error"); return quark; } diff --git a/gthread.c b/gthread.c index 654138f6f..034e7716d 100644 --- a/gthread.c +++ b/gthread.c @@ -55,14 +55,8 @@ GQuark g_thread_error_quark() { static GQuark quark; - G_LOCK_DEFINE_STATIC(lock); if (!quark) - { - G_LOCK (lock); - if (!quark) - quark = g_quark_from_static_string ("g-thread-error"); - G_UNLOCK (lock); - } + quark = g_quark_from_static_string ("g_thread_error"); return quark; }