Remove config_GetUserDataDir()...

...and fix a memory leak in LUA

diff --git a/include/vlc_configuration.h b/include/vlc_configuration.h
index 30aa958674725f8e85afa6a53302f3d88d8faa42..bdd734e303c176eccfb461be424c5d5d7c1ef0eb 100644 (file)
--- a/include/vlc_configuration.h
+++ b/include/vlc_configuration.h
@@ -216,13 +216,12 @@ VLC_EXPORT( void,   __config_ResetAll, ( vlc_object_t * ) );
 VLC_EXPORT( module_config_t *, config_FindConfig,( vlc_object_t *, const char * ) LIBVLC_USED );
 VLC_EXPORT(const char *, config_GetDataDir, ( void ) LIBVLC_USED);
 VLC_EXPORT(const char *, config_GetConfDir, ( void ) LIBVLC_USED);
-VLC_EXPORT(char *, config_GetUserDataDir, ( void ) LIBVLC_USED);
 
-typedef enum vlc_userdir {
-    /* User's home */
-    VLC_HOME_DIR,
-    /* VLC configuration directory */
-    VLC_CONFIG_DIR,
+typedef enum vlc_userdir
+{
+    VLC_HOME_DIR, /* User's home */
+    VLC_CONFIG_DIR, /* VLC-specific configuration directory */
+    VLC_DATA_DIR, /* VLC-specific data directory */
 } vlc_userdir_t;
 
 VLC_EXPORT(char *, config_GetUserDir, ( vlc_userdir_t ) LIBVLC_USED);

diff --git a/modules/gui/skins2/win32/win32_factory.cpp b/modules/gui/skins2/win32/win32_factory.cpp
index 47d4556c90c21e65b974f02dfdafa542f7ef98f1..dd02a3aa1a217b6f221a95528cfae2657ce7ec1d 100644 (file)
--- a/modules/gui/skins2/win32/win32_factory.cpp
+++ b/modules/gui/skins2/win32/win32_factory.cpp
@@ -225,7 +225,7 @@ bool Win32Factory::init()
     }
 
     // Initialize the resource path
-    char *datadir = config_GetUserDataDir();
+    char *datadir = config_GetUserDir( VLC_DATA_DIR );
     m_resourcePath.push_back( (string)datadir + "\\skins" );
     free( datadir );
     m_resourcePath.push_back( (string)config_GetDataDir() +

diff --git a/modules/gui/skins2/x11/x11_factory.cpp b/modules/gui/skins2/x11/x11_factory.cpp
index fe80a7b768876803fdf63ae4679058e555824e87..5982ad7a52ccaa347f1554f62d10695b10ab6644 100644 (file)
--- a/modules/gui/skins2/x11/x11_factory.cpp
+++ b/modules/gui/skins2/x11/x11_factory.cpp
@@ -75,7 +75,7 @@ bool X11Factory::init()
                                      ConnectionNumber( pDisplay ) );
 
     // Initialize the resource path
-    char *datadir = config_GetUserDataDir();
+    char *datadir = config_GetUserDataDir( VLC_DATA_DIR );
     m_resourcePath.push_back( (string)datadir + "/skins2" );
     free( datadir );
     m_resourcePath.push_back( (string)"share/skins2" );

diff --git a/modules/misc/gnutls.c b/modules/misc/gnutls.c
index cc40818ffaceb256b5f3d37231c709f8f4a657be..1901f559c3773274df142a0bbe09842e74cad0b6 100644 (file)
--- a/modules/misc/gnutls.c
+++ b/modules/misc/gnutls.c
@@ -675,7 +675,7 @@ static int OpenClient (vlc_object_t *obj)
         goto error;
     }
 
-    char *userdir = config_GetUserDataDir ();
+    char *userdir = config_GetDataDir ( VLC_DATA_DIR );
     if (userdir != NULL)
     {
         char path[strlen (userdir) + sizeof ("/ssl/private")];

diff --git a/modules/misc/lua/libs/misc.c b/modules/misc/lua/libs/misc.c
index e080d2776cf6dc4bd36637c7366acd7e97590d4f..e1b250f420a284324c6598272d108936f66c35d7 100644 (file)
--- a/modules/misc/lua/libs/misc.c
+++ b/modules/misc/lua/libs/misc.c
@@ -120,7 +120,9 @@ static int vlclua_datadir( lua_State *L )
 
 static int vlclua_userdatadir( lua_State *L )
 {
-    lua_pushstring( L, config_GetUserDataDir() );
+    char *dir = config_GetUserDir( VLC_DATA_DIR );
+    lua_pushstring( L, dir );
+    free( dir );
     return 1;
 }
 

diff --git a/modules/misc/lua/vlc.c b/modules/misc/lua/vlc.c
index f59c3914804be31342b12d24ae23598c4a23875c..2fa37dc027e30da701d13f2c388f4d0ee58bbe50 100644 (file)
--- a/modules/misc/lua/vlc.c
+++ b/modules/misc/lua/vlc.c
@@ -108,7 +108,7 @@ static int file_compare( const char **a, const char **b )
 int vlclua_dir_list( const char *luadirname, char **ppsz_dir_list )
 {
     int i = 0;
-    char *datadir = config_GetUserDataDir();
+    char *datadir = config_GetUserDir( VLC_DATA_DIR );
     if( datadir == NULL )
         return VLC_ENOMEM;
 

diff --git a/src/config/dirs.c b/src/config/dirs.c
index e2a2ed8ad307eb1d78ca956c225ed582bd62f68a..98abc6e3e0607975b2d8fe3fa194994ae843b9e4 100644 (file)
--- a/src/config/dirs.c
+++ b/src/config/dirs.c
@@ -248,15 +248,6 @@ static char *config_GetAppDir (const char *xdg_name, const char *xdg_default)
     return psz_dir;
 }
 
-/**
- * Get the user's VLC data directory
- * (used for stuff like the skins, custom lua modules, ...)
- */
-char *config_GetUserDataDir( void )
-{
-    return config_GetAppDir ("DATA", ".local/share");
-}
-
 /**
  * Get the user's VLC cache directory
  * (used for stuff like the modules cache, the album art cache, ...)
@@ -284,6 +275,8 @@ char *config_GetUserDir (vlc_userdir_t type)
             return config_GetHomeDir ();
         case VLC_CONFIG_DIR:
             return config_GetAppDir ("CONFIG", ".config");
+        case VLC_DATA_DIR:
+            return config_GetAppDir ("DATA", ".local/share");
     }
     assert (0);
 }

diff --git a/src/control/media_library.c b/src/control/media_library.c
index 2075f310b0438415806134d92c0d17fef6d5c9c8..d25e4146814ac2bfc16b168f64f985a1087d76b0 100644 (file)
--- a/src/control/media_library.c
+++ b/src/control/media_library.c
@@ -108,7 +108,7 @@ void
 libvlc_media_library_load( libvlc_media_library_t * p_mlib,
                            libvlc_exception_t * p_e )
 {
-    char *psz_datadir = config_GetUserDataDir();
+    char *psz_datadir = config_GetUserDir( VLC_DATA_DIR );
     char * psz_uri;
 
     if( !psz_datadir ) /* XXX: i doubt that this can ever happen */

diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index 4680bac348346cf03746d1b78cd00f679f9bce44..d0dc3672089f14e30d2e987536600ce0a840ff07 100644 (file)
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -58,7 +58,6 @@ config_GetUserDir
 __config_GetInt
 __config_GetPsz
 __config_GetType
-config_GetUserDataDir
 __config_PutFloat
 __config_PutInt
 __config_PutPsz

diff --git a/src/playlist/loadsave.c b/src/playlist/loadsave.c
index 7477b67c6255f41c3786674fb5cf8408b3e98c85..b1dc3abaa333e5bb70742690e9f4b97afec51038 100644 (file)
--- a/src/playlist/loadsave.c
+++ b/src/playlist/loadsave.c
@@ -125,7 +125,7 @@ int playlist_MLLoad( playlist_t *p_playlist )
     if( !config_GetInt( p_playlist, "media-library") )
         return VLC_SUCCESS;
 
-    psz_datadir = config_GetUserDataDir();
+    psz_datadir = config_GetUserDir( VLC_DATA_DIR );
 
     if( !psz_datadir ) /* XXX: This should never happen */
     {
@@ -208,7 +208,7 @@ int playlist_MLDump( playlist_t *p_playlist )
     if( !config_GetInt( p_playlist, "media-library") )
         return VLC_SUCCESS;
 
-    psz_datadir = config_GetUserDataDir();
+    psz_datadir = config_GetUserDir( VLC_DATA_DIR );
 
     if( !psz_datadir ) /* XXX: This should never happen */
     {