From: JP Dinger <jpd@videolan.org>
Date: Mon, 25 May 2009 13:12:23 +0000 (+0200)
Subject: Revert "Compile fix on windows -- vlc_mutex_init() now returns void."
X-Git-Tag: 1.1.0-ff~5775
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=b9646f8f0f92633b0b583059924e05c15df6368d;p=vlc

Revert "Compile fix on windows -- vlc_mutex_init() now returns void."
Fix turns out to not be quite a fix.

This reverts commit ba8f1f35e809572fb556818662bdf531a8a1c79a.
---

diff --git a/include/vlc_gcrypt.h b/include/vlc_gcrypt.h
index db054f42c3..cd5ffd5457 100644
--- a/include/vlc_gcrypt.h
+++ b/include/vlc_gcrypt.h
@@ -44,8 +44,12 @@ static int gcry_vlc_mutex_init( void **p_sys )
     if( p_lock == NULL)
         return ENOMEM;
 
-    vlc_mutex_init( p_lock );
-    return VLC_SUCCESS;
+    i_val = vlc_mutex_init( p_lock );
+    if( i_val )
+        free( p_lock );
+    else
+        *p_sys = p_lock;
+    return i_val;
 }
 
 static int gcry_vlc_mutex_destroy( void **p_sys )