Skip to content

V
vlc-2-2
Commit c138ff41 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

ETIMEDOUT is perfectly expected here, do not complain about it

parent 8b37adbf
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
include/vlc_threads_funcs.h
View file @ c138ff41
...@@ -580,8 +580,10 @@ static inline int __vlc_cond_timedwait( const char * psz_file, int i_line, ...@@ -580,8 +580,10 @@ static inline int __vlc_cond_timedwait( const char * psz_file, int i_line,
struct timespec ts = { d.quot, d.rem * 1000 }; struct timespec ts = { d.quot, d.rem * 1000 };
i_res = pthread_cond_timedwait( &p_condvar->cond, &p_mutex->mutex, &ts ); i_res = pthread_cond_timedwait( &p_condvar->cond, &p_mutex->mutex, &ts );
if( i_res = ETIMEDOUT )
if ( i_res ) i_res = 0; /* this error is perfectly normal */
else
if ( i_res ) /* other errors = bug */
{ {
i_thread = CAST_PTHREAD_TO_INT(pthread_self()); i_thread = CAST_PTHREAD_TO_INT(pthread_self());
psz_error = strerror(i_res); psz_error = strerror(i_res);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment