Removes trailing spaces. Removes tabs.

[vlc] / src / libvlc-common.c

diff --git a/src/libvlc-common.c b/src/libvlc-common.c
index 15e789e59359205d4f671832eac88e455f4c99cb..f97f4defc175d9745d5e9a7159a4a9932965a121 100644 (file)
--- a/src/libvlc-common.c
+++ b/src/libvlc-common.c
@@ -218,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;
 
@@ -327,25 +325,11 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] )
     }
 
     /* Set the config file stuff */
-    p_libvlc->psz_homedir = config_GetHomeDir();
-    p_libvlc->psz_userdir = config_GetUserDir();
-    if( p_libvlc->psz_userdir == NULL )
-        p_libvlc->psz_userdir = strdup(p_libvlc->psz_homedir);
-    p_libvlc->psz_configfile = config_GetPsz( p_libvlc, "config" );
-    if( (p_libvlc->psz_configfile != NULL) && (p_libvlc->psz_configfile[0] == '~')
-         && (p_libvlc->psz_configfile[1] == '/') )
-    {
-        char *psz = malloc( strlen(p_libvlc->psz_userdir)
-                             + strlen(p_libvlc->psz_configfile) );
-        if( psz )
-        {
-            /* This is incomplete : we should also support the ~cmassiot/ syntax. */
-            sprintf( psz, "%s/%s", p_libvlc->psz_userdir,
-                                p_libvlc->psz_configfile + 2 );
-            free( p_libvlc->psz_configfile );
-            p_libvlc->psz_configfile = psz;
-        } /* else keep old config stuff */
-    }
+    p_libvlc->psz_homedir    = config_GetHomeDir();
+    p_libvlc->psz_configdir  = config_GetConfigDir( p_libvlc );
+    p_libvlc->psz_datadir    = config_GetUserDataDir( p_libvlc );
+    p_libvlc->psz_cachedir   = config_GetCacheDir( p_libvlc );
+    p_libvlc->psz_configfile = config_GetCustomConfigFile( p_libvlc );
 
     /* Check for plugins cache options */
     if( config_GetInt( p_libvlc, "reset-plugins-cache" ) )
@@ -656,7 +640,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] )
 
                     /* append MRLs */
                     dbus_message_iter_init_append( p_dbus_msg, &dbus_args );
-                    if ( !dbus_message_iter_append_basic( &dbus_args, 
+                    if ( !dbus_message_iter_append_basic( &dbus_args,
                                 DBUS_TYPE_STRING, &ppsz_argv[i_input] ) )
                     {
                         msg_Err( p_libvlc, "Out of memory" );
@@ -1069,7 +1053,9 @@ int libvlc_InternalDestroy( libvlc_int_t *p_libvlc, vlc_bool_t b_release )
     module_EndBank( p_libvlc );
 
     FREENULL( p_libvlc->psz_homedir );
-    FREENULL( p_libvlc->psz_userdir );
+    FREENULL( p_libvlc->psz_configdir );
+    FREENULL( p_libvlc->psz_datadir );
+    FREENULL( p_libvlc->psz_cachedir );
     FREENULL( p_libvlc->psz_configfile );
     FREENULL( p_libvlc->p_hotkeys );
 
@@ -1098,7 +1084,7 @@ int libvlc_InternalDestroy( libvlc_int_t *p_libvlc, vlc_bool_t b_release )
     p_libvlc = NULL;
 
     /* Stop thread system: last one out please shut the door!
-     * The number of initializations of the thread system is counted, we 
+     * The number of initializations of the thread system is counted, we
      * can call this each time */
     vlc_threads_end( p_libvlc_global );
 
@@ -1387,6 +1373,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 */
@@ -1771,7 +1759,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 ) )