diff options
| author | Stef Walter <stefw@gnome.org> | 2013-04-02 18:33:12 +0200 |
|---|---|---|
| committer | Stef Walter <stefw@gnome.org> | 2013-04-03 10:39:09 +0200 |
| commit | ae7dd1be6d431f25b101bc7e2b3fa373a8cbb47b (patch) | |
| tree | cf8c828a53b83e959959aa8101e292f987944e13 | |
| parent | 2e8f586cd5a0c4cf2471c085e9e0e4fdcc04d996 (diff) | |
Don't use library locks from p11-kit tool
The global library p11_library_mutex is for libraries to use, so don't
use it from any code in common/, which is also used by the p11-kit tool
https://bugs.freedesktop.org/show_bug.cgi?id=63046
| -rw-r--r-- | common/library.c | 4 | ||||
| -rw-r--r-- | p11-kit/util.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/common/library.c b/common/library.c index e4512a1..71dd3b9 100644 --- a/common/library.c +++ b/common/library.c @@ -111,17 +111,13 @@ p11_message (const char* msg, void p11_message_quiet (void) { - p11_lock (); print_messages = false; - p11_unlock (); } void p11_message_loud (void) { - p11_lock (); print_messages = true; - p11_unlock (); } const char* diff --git a/p11-kit/util.c b/p11-kit/util.c index 62aa7d2..bb074ac 100644 --- a/p11-kit/util.c +++ b/p11-kit/util.c @@ -141,8 +141,10 @@ p11_kit_space_strdup (const unsigned char *string, size_t max_length) void p11_kit_be_quiet (void) { + p11_lock (); p11_message_quiet (); p11_debug_init (); + p11_unlock (); } /** @@ -154,8 +156,10 @@ p11_kit_be_quiet (void) void p11_kit_be_loud (void) { + p11_lock (); p11_message_loud (); p11_debug_init (); + p11_unlock (); } /** |