X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_gcrypt.h;h=4cf65ac4c23559a0fd38df85a341049d3a5259cd;hb=1af1b86864e7d6ef241011b8e97941ed673fd5ad;hp=cd5ffd54572cefabaf9f07270041a4da4cc938f5;hpb=b9646f8f0f92633b0b583059924e05c15df6368d;p=vlc

diff --git a/include/vlc_gcrypt.h b/include/vlc_gcrypt.h
index cd5ffd5457..4cf65ac4c2 100644
--- a/include/vlc_gcrypt.h
+++ b/include/vlc_gcrypt.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * vlc_gcrypt.h: VLC thread support for gcrypt
  *****************************************************************************
- * Copyright (C) 2004-2008 Rémi Denis-Courmont
+ * Copyright (C) 2004-2010 Rémi Denis-Courmont
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,6 +23,8 @@
  * This file implements gcrypt support functions in vlc
  */
 
+#include <errno.h>
+
 #ifdef LIBVLC_USE_PTHREAD
 /**
  * If possible, use gcrypt-provided thread implementation. This is so that
@@ -38,18 +40,13 @@ GCRY_THREAD_OPTION_PTHREAD_IMPL;
 
 static int gcry_vlc_mutex_init( void **p_sys )
 {
-    int i_val;
     vlc_mutex_t *p_lock = (vlc_mutex_t *)malloc( sizeof( vlc_mutex_t ) );
-
     if( p_lock == NULL)
         return ENOMEM;
 
-    i_val = vlc_mutex_init( p_lock );
-    if( i_val )
-        free( p_lock );
-    else
-        *p_sys = p_lock;
-    return i_val;
+    vlc_mutex_init( p_lock );
+    *p_sys = p_lock;
+    return VLC_SUCCESS;
 }
 
 static int gcry_vlc_mutex_destroy( void **p_sys )
@@ -79,7 +76,8 @@ static const struct gcry_thread_cbs gcry_threads_vlc =
     gcry_vlc_mutex_init,
     gcry_vlc_mutex_destroy,
     gcry_vlc_mutex_lock,
-    gcry_vlc_mutex_unlock
+    gcry_vlc_mutex_unlock,
+    NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
 };
 #endif
 
@@ -93,14 +91,13 @@ static inline void vlc_gcrypt_init (void)
      * plugins linking with gcrypt, and some underlying libraries may use it
      * behind our back. Only way is to always link gcrypt statically (ouch!) or
      * have upstream gcrypt provide one shared object per threading system. */
-    static vlc_mutex_t lock = VLC_STATIC_MUTEX;
     static bool done = false;
 
-    vlc_mutex_lock (&lock);
+    vlc_global_lock (VLC_GCRYPT_MUTEX);
     if (!done)
     {
         gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_vlc);
         done = true;
     }
-    vlc_mutex_unlock (&lock);
+    vlc_global_unlock (VLC_GCRYPT_MUTEX);
 }