Changing the order of parameters may be needed, but changing the parameters themselve...

[vlc] / src / control / core.c

diff --git a/src/control/core.c b/src/control/core.c
index 6c189ce86b412507bcf27c15863b8d5f13d9623a..d52023597f7fec9fea98bfcd12082345a2376e5c 100644 (file)
--- a/src/control/core.c
+++ b/src/control/core.c
@@ -26,6 +26,8 @@
 
 #include <vlc_interface.h>
 
+static const char nomemstr[] = "Insufficient memory";
+
 /*************************************************************************
  * Exceptions handling
  *************************************************************************/
@@ -37,18 +39,19 @@ void libvlc_exception_init( libvlc_exception_t *p_exception )
 
 void libvlc_exception_clear( libvlc_exception_t *p_exception )
 {
-    if( p_exception->psz_message )
+    if( p_exception->psz_message != nomemstr )
         free( p_exception->psz_message );
     p_exception->psz_message = NULL;
     p_exception->b_raised = 0;
 }
 
-int libvlc_exception_raised( libvlc_exception_t *p_exception )
+int libvlc_exception_raised( const libvlc_exception_t *p_exception )
 {
     return (NULL != p_exception) && p_exception->b_raised;
 }
 
-char *libvlc_exception_get_message( libvlc_exception_t *p_exception )
+const char *
+libvlc_exception_get_message( const libvlc_exception_t *p_exception )
 {
     if( p_exception->b_raised == 1 && p_exception->psz_message )
     {
@@ -66,18 +69,17 @@ void libvlc_exception_raise( libvlc_exception_t *p_exception,
     if( p_exception == NULL ) return;
 
     /* remove previous exception if it wasn't cleared */
-    if( p_exception->b_raised && p_exception->psz_message )
-        free(p_exception->psz_message);
+    libvlc_exception_clear( p_exception );
 
     va_start( args, psz_format );
     if( vasprintf( &p_exception->psz_message, psz_format, args ) == -1)
-        p_exception->psz_message = NULL;
+        p_exception->psz_message = (char *)nomemstr;
     va_end( args );
 
     p_exception->b_raised = 1;
 }
 
-libvlc_instance_t * libvlc_new( int argc, char **argv,
+libvlc_instance_t * libvlc_new( int argc, const char *const *argv,
                                 libvlc_exception_t *p_e )
 {
     libvlc_instance_t *p_new;
@@ -88,10 +90,17 @@ libvlc_instance_t * libvlc_new( int argc, char **argv,
     p_new = (libvlc_instance_t *)malloc( sizeof( libvlc_instance_t ) );
     if( !p_new ) RAISENULL( "Out of memory" );
 
+    const char *my_argv[argc + 2];
+
+    my_argv[0] = "libvlc"; /* dummy arg0, skipped by getopt() et al */
+    for( int i = 0; i < argc; i++ )
+         my_argv[i + 1] = argv[i];
+    my_argv[argc + 1] = NULL; /* C calling conventions require a NULL */
+
     /** \todo Look for interface settings. If we don't have any, add -I dummy */
-    /* Because we probably don't want a GUI by default */    
+    /* Because we probably don't want a GUI by default */
 
-    if( libvlc_InternalInit( p_libvlc_int, argc, argv ) )
+    if( libvlc_InternalInit( p_libvlc_int, argc + 1, my_argv ) )
         RAISENULL( "VLC initialization failed" );
 
     p_new->p_libvlc_int = p_libvlc_int;
@@ -100,7 +109,7 @@ libvlc_instance_t * libvlc_new( int argc, char **argv,
     p_new->p_callback_list = NULL;
     vlc_mutex_init(p_libvlc_int, &p_new->instance_lock);
     vlc_mutex_init(p_libvlc_int, &p_new->event_callback_lock);
-    
+ 
     libvlc_event_init(p_new, p_e);
 
     return p_new;