Hide b_attached.

[vlc] / src / libvlc-common.c

diff --git a/src/libvlc-common.c b/src/libvlc-common.c
index b6efb7cc51ead4e046e9eef1e5c67b0852277817..8535c3e45ed3c0e91daf66576640edce382a5642 100644 (file)
--- a/src/libvlc-common.c
+++ b/src/libvlc-common.c
@@ -122,9 +122,9 @@ static int  VerboseCallback( vlc_object_t *, char const *,
 
 static void InitDeviceValues( libvlc_int_t * );
 
-vlc_object_t * vlc_global_object( void )
+libvlc_global_data_t *vlc_global( void )
 {
-    return VLC_OBJECT( &libvlc_global );
+    return &libvlc_global;
 }
 
 /*****************************************************************************
@@ -193,7 +193,6 @@ libvlc_int_t * libvlc_InternalCreate( void )
         i_instances--;
         return NULL;
     }
-    p_libvlc->thread_id = 0;
     p_libvlc->p_playlist = NULL;
     p_libvlc->psz_object_name = "libvlc";
 
@@ -219,8 +218,6 @@ libvlc_int_t * libvlc_InternalCreate( void )
     vlc_mutex_init( p_libvlc, &p_libvlc->quicktime_lock );
     vlc_thread_set_priority( p_libvlc, VLC_THREAD_PRIORITY_LOW );
 #endif
-    /* Fake attachment */
-    p_libvlc->b_attached = VLC_TRUE;
     /* Store data for the non-reentrant API */
     p_static_vlc = p_libvlc;
 
@@ -1388,6 +1385,8 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name )
                     break;
                 pp_shortcut ++;
             }
+            if( !*pp_shortcut )
+                continue;
         }
 
         /* Ignore modules without config options */
@@ -1772,7 +1771,7 @@ static void ListModules( libvlc_int_t *p_this, vlc_bool_t b_verbose )
 
         if( b_verbose )
         {
-            const char **pp_shortcut = p_parser->pp_shortcuts;
+            const char *const *pp_shortcut = p_parser->pp_shortcuts;
             while( *pp_shortcut )
             {
                 if( strcmp( *pp_shortcut, p_parser->psz_object_name ) )