[vlc-devel] commit: Handles the VLC_EEXITSUCESS case (Christophe Mutricy )
git version control
git at videolan.org
Sun Jun 1 12:15:31 CEST 2008
vlc | branch: master | Christophe Mutricy <xtophe at videolan.org> | Sun Jun 1 11:16:57 2008 +0100| [dd9d6f4ed86df260b6447a4a1d8db5a5ccaeee48]
Handles the VLC_EEXITSUCESS case
So that vlc --{list,help,module} don't get us a non-null exit code
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=dd9d6f4ed86df260b6447a4a1d8db5a5ccaeee48
---
src/control/core.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/control/core.c b/src/control/core.c
index b5efae2..fd305bb 100644
--- a/src/control/core.c
+++ b/src/control/core.c
@@ -104,7 +104,7 @@ libvlc_instance_t * libvlc_new( int argc, const char *const *argv,
libvlc_exception_t *p_e )
{
libvlc_instance_t *p_new;
-
+ int i_ret;
libvlc_int_t *p_libvlc_int = libvlc_InternalCreate();
if( !p_libvlc_int ) RAISENULL( "VLC initialization failed" );
@@ -121,7 +121,10 @@ libvlc_instance_t * libvlc_new( int argc, const char *const *argv,
/** \todo Look for interface settings. If we don't have any, add -I dummy */
/* Because we probably don't want a GUI by default */
- if( libvlc_InternalInit( p_libvlc_int, argc + 1, my_argv ) )
+ i_ret=libvlc_InternalInit( p_libvlc_int, argc + 1, my_argv );
+ if( i_ret == VLC_EEXITSUCCESS )
+ return NULL;
+ else if( i_ret != 0 )
RAISENULL( "VLC initialization failed" );
p_new->p_libvlc_int = p_libvlc_int;
More information about the vlc-devel
mailing list