Commit 4a24608b authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Replace VLC_ETHREAD with VLCENOMEM.

This is consistent with existing practice inside and outside of VLC.
We really don't need a separate error code for that.
parent 401c5a7e
...@@ -434,7 +434,6 @@ struct vlc_list_t ...@@ -434,7 +434,6 @@ struct vlc_list_t
*****************************************************************************/ *****************************************************************************/
#define VLC_SUCCESS -0 /* No error */ #define VLC_SUCCESS -0 /* No error */
#define VLC_ENOMEM -1 /* Not enough memory */ #define VLC_ENOMEM -1 /* Not enough memory */
#define VLC_ETHREAD -2 /* Thread error */
#define VLC_ETIMEOUT -3 /* Timeout */ #define VLC_ETIMEOUT -3 /* Timeout */
#define VLC_ENOMOD -10 /* Module not found */ #define VLC_ENOMOD -10 /* Module not found */
......
...@@ -175,7 +175,7 @@ static int Open( vlc_object_t * p_this ) ...@@ -175,7 +175,7 @@ static int Open( vlc_object_t * p_this )
delete pPlayer; delete pPlayer;
free( p_sys->ppBuffers ); free( p_sys->ppBuffers );
free( p_sys ); free( p_sys );
return VLC_ETHREAD; return VLC_ENOMEM;
} }
return VLC_SUCCESS; return VLC_SUCCESS;
......
...@@ -522,7 +522,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -522,7 +522,7 @@ static int Open( vlc_object_t *p_this )
msg_Err( p_aout, "cannot create OSS thread (%m)" ); msg_Err( p_aout, "cannot create OSS thread (%m)" );
close( p_sys->i_fd ); close( p_sys->i_fd );
free( p_sys ); free( p_sys );
return VLC_ETHREAD; return VLC_ENOMEM;
} }
return VLC_SUCCESS; return VLC_SUCCESS;
......
...@@ -115,7 +115,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -115,7 +115,7 @@ static int Open( vlc_object_t *p_this )
vlc_object_release( p_gtk_main ); vlc_object_release( p_gtk_main );
i_refcount--; i_refcount--;
vlc_mutex_unlock( &gtk_lock ); vlc_mutex_unlock( &gtk_lock );
return VLC_ETHREAD; return VLC_ENOMEM;
} }
i_refcount++; i_refcount++;
......
...@@ -109,7 +109,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -109,7 +109,7 @@ static int Open( vlc_object_t *p_this )
vlc_object_release( p_qte_main ); vlc_object_release( p_qte_main );
i_refcount--; i_refcount--;
vlc_mutex_unlock( lock ); vlc_mutex_unlock( lock );
return VLC_ETHREAD; return VLC_ENOMEM;
} }
i_refcount++; i_refcount++;
......
...@@ -45,8 +45,6 @@ char const * vlc_error ( int i_err ) ...@@ -45,8 +45,6 @@ char const * vlc_error ( int i_err )
case VLC_ENOMEM: case VLC_ENOMEM:
return "not enough memory"; return "not enough memory";
case VLC_ETHREAD:
return "thread error";
case VLC_ETIMEOUT: case VLC_ETIMEOUT:
return "timeout"; return "timeout";
......
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