fix compilation on Linux

[vlc] / src / misc / threads.c

diff --git a/src/misc/threads.c b/src/misc/threads.c
index 780bef8f240c00d71ed28a00c8a5a3ae12f12193..647dd3773a87f6296509cb4f18b3059935da6b34 100644 (file)
--- a/src/misc/threads.c
+++ b/src/misc/threads.c
@@ -297,31 +297,21 @@ int __vlc_mutex_init( vlc_object_t *p_this, vlc_mutex_t *p_mutex )
 
 #elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
 # if defined(DEBUG)
-#   if defined(SYS_LINUX)
     {
         /* Create error-checking mutex to detect problems more easily. */
         pthread_mutexattr_t attr;
         int                 i_result;
 
         pthread_mutexattr_init( &attr );
+#   if defined(SYS_LINUX)
         pthread_mutexattr_setkind_np( &attr, PTHREAD_MUTEX_ERRORCHECK_NP );
-        i_result = pthread_mutex_init( &p_mutex->mutex, &attr );
-        pthread_mutexattr_destroy( &attr );
-        return( i_result );
-    }
 #   else
-    {
-        /* Create error-checking mutex to detect problems more easily. */
-        pthread_mutexattr_t attr;
-        int                 i_result;
-
-        pthread_mutexattr_init( &attr );
         pthread_mutexattr_settype( &attr, PTHREAD_MUTEX_ERRORCHECK );
+#   endif
         i_result = pthread_mutex_init( &p_mutex->mutex, &attr );
         pthread_mutexattr_destroy( &attr );
         return( i_result );
     }
-#   endif
 # endif
     return pthread_mutex_init( &p_mutex->mutex, NULL );
 
@@ -340,7 +330,6 @@ int __vlc_mutex_destroy( const char * psz_file, int i_line, vlc_mutex_t *p_mutex
     int i_result;
     /* In case of error : */
     int i_thread = -1;
-    const char * psz_error = "";
 
 #if defined( PTH_INIT_IN_PTH_H )
     return 0;
@@ -377,7 +366,7 @@ int __vlc_mutex_destroy( const char * psz_file, int i_line, vlc_mutex_t *p_mutex
     if( i_result )
     {
         i_thread = CAST_PTHREAD_TO_INT(pthread_self());
-        psz_error = strerror(i_result);
+        errno = i_result;
     }
 
 #elif defined( HAVE_CTHREADS_H )
@@ -388,8 +377,8 @@ int __vlc_mutex_destroy( const char * psz_file, int i_line, vlc_mutex_t *p_mutex
     if( i_result )
     {
         msg_Err( p_mutex->p_this,
-                 "thread %d: mutex_destroy failed at %s:%d (%d:%s)",
-                 i_thread, psz_file, i_line, i_result, psz_error );
+                 "thread %d: mutex_destroy failed at %s:%d (%d:%m)",
+                 i_thread, psz_file, i_line, i_result );
     }
     return i_result;
 }
@@ -510,7 +499,6 @@ int __vlc_cond_destroy( const char * psz_file, int i_line, vlc_cond_t *p_condvar
     int i_result;
     /* In case of error : */
     int i_thread = -1;
-    const char * psz_error = "";
 
 #if defined( PTH_INIT_IN_PTH_H )
     return 0;
@@ -540,7 +528,7 @@ int __vlc_cond_destroy( const char * psz_file, int i_line, vlc_cond_t *p_condvar
     if( i_result )
     {
         i_thread = CAST_PTHREAD_TO_INT(pthread_self());
-        psz_error = strerror(i_result);
+        errno = i_result;
     }
 
 #elif defined( HAVE_CTHREADS_H )
@@ -551,8 +539,8 @@ int __vlc_cond_destroy( const char * psz_file, int i_line, vlc_cond_t *p_condvar
     if( i_result )
     {
         msg_Err( p_condvar->p_this,
-                 "thread %d: cond_destroy failed at %s:%d (%d:%s)",
-                 i_thread, psz_file, i_line, i_result, psz_error );
+                 "thread %d: cond_destroy failed at %s:%d (%d:%m)",
+                 i_thread, psz_file, i_line, i_result );
     }
     return i_result;
 }
@@ -675,8 +663,9 @@ int __vlc_thread_create( vlc_object_t *p_this, const char * psz_file, int i_line
         if( (i_error = pthread_setschedparam( p_priv->thread_id,
                                                i_policy, &param )) )
         {
-            msg_Warn( p_this, "couldn't set thread priority (%s:%d): %s",
-                      psz_file, i_line, strerror(i_error) );
+            errno = i_error;
+            msg_Warn( p_this, "couldn't set thread priority (%s:%d): %m",
+                      psz_file, i_line );
             i_priority = 0;
         }
     }
@@ -718,8 +707,9 @@ int __vlc_thread_create( vlc_object_t *p_this, const char * psz_file, int i_line
     }
     else
     {
-        msg_Err( p_this, "%s thread could not be created at %s:%d (%s)",
-                         psz_name, psz_file, i_line, strerror(i_ret) );
+        errno = i_ret;
+        msg_Err( p_this, "%s thread could not be created at %s:%d (%m)",
+                         psz_name, psz_file, i_line );
         vlc_mutex_unlock( &p_this->object_lock );
     }
 
@@ -772,8 +762,9 @@ int __vlc_thread_set_priority( vlc_object_t *p_this, const char * psz_file,
         if( (i_error = pthread_setschedparam( p_priv->thread_id,
                                                i_policy, &param )) )
         {
-            msg_Warn( p_this, "couldn't set thread priority (%s:%d): %s",
-                      psz_file, i_line, strerror(i_error) );
+            errno = i_error;
+            msg_Warn( p_this, "couldn't set thread priority (%s:%d): %m",
+                      psz_file, i_line );
             i_priority = 0;
         }
     }
@@ -891,9 +882,9 @@ void __vlc_thread_join( vlc_object_t *p_this, const char * psz_file, int i_line
 
     if( i_ret )
     {
-        msg_Err( p_this, "thread_join(%u) failed at %s:%d (%s)",
-                         (unsigned int)p_priv->thread_id, psz_file, i_line,
-                         strerror(i_ret) );
+        errno = i_ret;
+        msg_Err( p_this, "thread_join(%u) failed at %s:%d (%m)",
+                         (unsigned int)p_priv->thread_id, psz_file, i_line );
     }
     else
     {