Move psz_vlcpath out of p_root

[vlc] / src / config / dirs.c

diff --git a/src/config/dirs.c b/src/config/dirs.c
index 5877b4b2f109c9bbd948cb4e827ad91f171f12c6..16cbf8134c85f4f26b506be6a3e741ff7da7d862 100644 (file)
--- a/src/config/dirs.c
+++ b/src/config/dirs.c
@@ -64,8 +64,7 @@ const char *config_GetDataDir( void )
 
     if( *path == '\0' )
     {
-        snprintf( path, sizeof( path ), "%s" DIR_SEP DIR_SHARE,
-                  vlc_global()->psz_vlcpath );
+        snprintf( path, sizeof( path ), "%s" DIR_SEP DIR_SHARE, psz_vlcpath );
         path[sizeof( path ) - 1] = '\0';
     }
     return path;
@@ -155,7 +154,7 @@ const char *config_GetConfDir( void )
     if( *path == '\0' )
     {
         snprintf( path, sizeof( path ), "%s"DIR_SEP DIR_SHARE, /* FIXME: Duh? */
-                  vlc_global()->psz_vlcpath );
+                  psz_vlcpath );
         path[sizeof( path ) - 1] = '\0';
     }
     return path;