Missing return value

[vlc] / src / control / core.c

diff --git a/src/control/core.c b/src/control/core.c
index 9db56144d44321dda1455f95b17e01f0dc2cebf7..a96ff039d0688055a0d2e8b929836a74fa7246fa 100644 (file)
--- a/src/control/core.c
+++ b/src/control/core.c
@@ -25,6 +25,7 @@
 #include <vlc/libvlc.h>
 
 #include <vlc_interface.h>
+#include <vlc_vlm.h>
 
 #include <stdarg.h>
 #include <limits.h>
@@ -43,6 +44,8 @@ void libvlc_exception_init( libvlc_exception_t *p_exception )
 
 void libvlc_exception_clear( libvlc_exception_t *p_exception )
 {
+    if( NULL == p_exception )
+        return;
     if( p_exception->psz_message != nomemstr )
         free( p_exception->psz_message );
     p_exception->psz_message = NULL;
@@ -68,6 +71,7 @@ static void libvlc_exception_not_handled( const char *psz )
 {
     fprintf( stderr, "*** LibVLC Exception not handled: %s\nSet a breakpoint in '%s' to debug.\n",
              psz, __func__ );
+    abort();
 }
 
 void libvlc_exception_raise( libvlc_exception_t *p_exception,
@@ -87,6 +91,8 @@ void libvlc_exception_raise( libvlc_exception_t *p_exception,
         /* Print something, so that lazy third-parties can easily
          * notice that something may have gone unnoticedly wrong */
         libvlc_exception_not_handled( psz );
+        if( psz != nomemstr )
+            free( psz );
         return;
     }
 
@@ -108,7 +114,7 @@ libvlc_instance_t * libvlc_new( int argc, const char *const *argv,
     libvlc_int_t *p_libvlc_int = libvlc_InternalCreate();
     if( !p_libvlc_int ) RAISENULL( "VLC initialization failed" );
 
-    p_new = (libvlc_instance_t *)malloc( sizeof( libvlc_instance_t ) );
+    p_new = malloc( sizeof( libvlc_instance_t ) );
     if( !p_new ) RAISENULL( "Out of memory" );
 
     const char *my_argv[argc + 2];
@@ -121,16 +127,24 @@ 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 */
 
-    i_ret=libvlc_InternalInit( p_libvlc_int, argc + 1, my_argv );
-    if( i_ret == VLC_EEXITSUCCESS )
+    i_ret = libvlc_InternalInit( p_libvlc_int, argc + 1, my_argv );
+    if( i_ret )
+    {
+        libvlc_InternalDestroy( p_libvlc_int );
+        free( p_new );
+        if( i_ret == VLC_EEXITSUCCESS )
             return NULL;
-    else if( i_ret != 0 )
-        RAISENULL( "VLC initialization failed" );
+        else
+            RAISENULL( "VLC initialization failed" );
+    }
 
     p_new->p_libvlc_int = p_libvlc_int;
-    p_new->p_vlm = NULL;
+    p_new->libvlc_vlm.p_vlm = NULL;
+    p_new->libvlc_vlm.p_event_manager = NULL;
+    p_new->libvlc_vlm.pf_release = NULL;
     p_new->b_playlist_locked = 0;
     p_new->ref_count = 1;
+    p_new->verbosity = 1;
     p_new->p_callback_list = NULL;
     vlc_mutex_init(&p_new->instance_lock);
     vlc_mutex_init(&p_new->event_callback_lock);
@@ -153,9 +167,8 @@ void libvlc_release( libvlc_instance_t *p_instance )
     vlc_mutex_t *lock = &p_instance->instance_lock;
     int refs;
 
-    assert( p_instance->ref_count > 0 );
-
     vlc_mutex_lock( lock );
+    assert( p_instance->ref_count > 0 );
     refs = --p_instance->ref_count;
     vlc_mutex_unlock( lock );
 
@@ -163,31 +176,29 @@ void libvlc_release( libvlc_instance_t *p_instance )
     {
         vlc_mutex_destroy( lock );
         vlc_mutex_destroy( &p_instance->event_callback_lock );
+        if( p_instance->libvlc_vlm.pf_release )
+            p_instance->libvlc_vlm.pf_release( p_instance );
         libvlc_InternalCleanup( p_instance->p_libvlc_int );
         libvlc_InternalDestroy( p_instance->p_libvlc_int );
         free( p_instance );
     }
 }
 
-void libvlc_add_intf( libvlc_instance_t *p_i, const char *name,
+int libvlc_add_intf( libvlc_instance_t *p_i, const char *name,
                       libvlc_exception_t *p_e )
 {
     if( libvlc_InternalAddIntf( p_i->p_libvlc_int, name ) )
-        RAISEVOID( "Interface initialization failed" );
+    {
+        libvlc_exception_raise( p_e, "Interface initialization failed" );
+        return -1;
+    }
+    return 0;
 }
 
 void libvlc_wait( libvlc_instance_t *p_i )
 {
     libvlc_int_t *p_libvlc = p_i->p_libvlc_int;
-    vlc_object_lock( p_libvlc );
-    while( vlc_object_alive( p_libvlc ) )
-        vlc_object_wait( p_libvlc );
-    vlc_object_unlock( p_libvlc );
-}
-
-int libvlc_get_vlc_id( libvlc_instance_t *p_instance )
-{
-    return p_instance->p_libvlc_int->i_object_id;
+    libvlc_InternalWait( p_libvlc );
 }
 
 const char * libvlc_get_version(void)
@@ -202,5 +213,18 @@ const char * libvlc_get_compiler(void)
 
 const char * libvlc_get_changeset(void)
 {
-    return VLC_Changeset();
+    extern const char psz_vlc_changeset[];
+    return psz_vlc_changeset;
+}
+
+/* export internal libvlc_instance for ugly hacks with libvlccore */
+vlc_object_t *libvlc_get_vlc_instance( libvlc_instance_t* p_instance )
+{
+    vlc_object_hold( p_instance->p_libvlc_int ) ;
+    return (vlc_object_t*) p_instance->p_libvlc_int ;
+}
+
+void libvlc_free( void *ptr )
+{
+    free( ptr );
 }