Browse Source

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.
pull/2/head
Rémi Denis-Courmont 17 years ago
parent
commit
4a24608bb3
  1. 1
      include/vlc_common.h
  2. 2
      modules/audio_output/hd1000a.cpp
  3. 2
      modules/audio_output/oss.c
  4. 2
      modules/misc/gtk_main.c
  5. 2
      modules/misc/qte_main.cpp
  6. 2
      src/misc/error.c

1
include/vlc_common.h

@ -434,7 +434,6 @@ struct vlc_list_t
*****************************************************************************/
#define VLC_SUCCESS -0 /* No error */
#define VLC_ENOMEM -1 /* Not enough memory */
#define VLC_ETHREAD -2 /* Thread error */
#define VLC_ETIMEOUT -3 /* Timeout */
#define VLC_ENOMOD -10 /* Module not found */

2
modules/audio_output/hd1000a.cpp

@ -175,7 +175,7 @@ static int Open( vlc_object_t * p_this )
delete pPlayer;
free( p_sys->ppBuffers );
free( p_sys );
return VLC_ETHREAD;
return VLC_ENOMEM;
}
return VLC_SUCCESS;

2
modules/audio_output/oss.c

@ -522,7 +522,7 @@ static int Open( vlc_object_t *p_this )
msg_Err( p_aout, "cannot create OSS thread (%m)" );
close( p_sys->i_fd );
free( p_sys );
return VLC_ETHREAD;
return VLC_ENOMEM;
}
return VLC_SUCCESS;

2
modules/misc/gtk_main.c

@ -115,7 +115,7 @@ static int Open( vlc_object_t *p_this )
vlc_object_release( p_gtk_main );
i_refcount--;
vlc_mutex_unlock( &gtk_lock );
return VLC_ETHREAD;
return VLC_ENOMEM;
}
i_refcount++;

2
modules/misc/qte_main.cpp

@ -109,7 +109,7 @@ static int Open( vlc_object_t *p_this )
vlc_object_release( p_qte_main );
i_refcount--;
vlc_mutex_unlock( lock );
return VLC_ETHREAD;
return VLC_ENOMEM;
}
i_refcount++;

2
src/misc/error.c

@ -45,8 +45,6 @@ char const * vlc_error ( int i_err )
case VLC_ENOMEM:
return "not enough memory";
case VLC_ETHREAD:
return "thread error";
case VLC_ETIMEOUT:
return "timeout";

Loading…
Cancel
Save