Rename var_GetGlobalMutex to var_AcquireMutex and make it lock the mutex automatically

[vlc] / modules / misc / gnutls.c

diff --git a/modules/misc/gnutls.c b/modules/misc/gnutls.c
index ed5b4e11ccce5767ffefa5d14f1d1f7677a00c58..8c83e25a4d1332049ef7c88c2ce7feb709e42ea1 100644 (file)
--- a/modules/misc/gnutls.c
+++ b/modules/misc/gnutls.c
@@ -172,8 +172,7 @@ static int gnutls_Init (vlc_object_t *p_this)
 {
     int ret = VLC_EGENERIC;
 
-    vlc_mutex_t *lock = var_GetGlobalMutex ("gnutls_mutex");
-    vlc_mutex_lock (lock);
+    vlc_mutex_t *lock = var_AcquireMutex ("gnutls_mutex");
 
     /* This should probably be removed/fixed. It will screw up with multiple
      * LibVLC instances. */
@@ -210,8 +209,7 @@ error:
  */
 static void gnutls_Deinit (vlc_object_t *p_this)
 {
-    vlc_mutex_t *lock = var_GetGlobalMutex( "gnutls_mutex" );
-    vlc_mutex_lock (lock);
+    vlc_mutex_t *lock = var_AcquireMutex( "gnutls_mutex" );
 
     gnutls_global_deinit ();
     msg_Dbg (p_this, "GnuTLS deinitialized");