Remove unused config_GetConfDir

diff --git a/extras/buildsystem/cmake/CMakeLists/src_CMakeLists.txt b/extras/buildsystem/cmake/CMakeLists/src_CMakeLists.txt
index b178b81b8a74a5af90012d2f1583131cc5f6a970..ac7b06e8b0652199ae35750648994596f4892f03 100644 (file)
--- a/extras/buildsystem/cmake/CMakeLists/src_CMakeLists.txt
+++ b/extras/buildsystem/cmake/CMakeLists/src_CMakeLists.txt
@@ -1,7 +1,6 @@
 
 add_definitions(-Dasm=__asm__ -D_INTL_REDIRECT_MACROS)
 add_definitions(-DLOCALEDIR="${CMAKE_INSTALL_PREFIX}/locale")
-add_definitions(-DSYSCONFDIR="${CMAKE_INSTALL_PREFIX}/etc")
 add_definitions(-DPLUGIN_PATH="${CMAKE_INSTALL_PREFIX}/lib/vlc")
 add_definitions(-DDATA_PATH="${CMAKE_INSTALL_PREFIX}/share/vlc")
 

diff --git a/include/vlc_configuration.h b/include/vlc_configuration.h
index c3df09773eb68fe7164c8844805496ce88263d3a..acd1f410c2b650ea91cacadaa15d9763b53456d8 100644 (file)
--- a/include/vlc_configuration.h
+++ b/include/vlc_configuration.h
@@ -120,7 +120,6 @@ VLC_API void config_ResetAll( vlc_object_t * );
 VLC_API module_config_t * config_FindConfig( vlc_object_t *, const char * ) VLC_USED;
 VLC_API char * config_GetDataDir(void) VLC_USED VLC_MALLOC;
 VLC_API char *config_GetLibDir(void) VLC_USED;
-VLC_API const char * config_GetConfDir( void ) VLC_USED;
 
 typedef enum vlc_userdir
 {

diff --git a/src/Makefile.am b/src/Makefile.am
index 9ac25d35fb8cb1cdfc10d826e809ad1994cf459d..96923f99bd3b3284c104f8598621cd97341534e3 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -167,7 +167,6 @@ lib_LTLIBRARIES = libvlccore.la
 AM_CPPFLAGS = $(INCICONV) $(IDN_CFLAGS) \
        -DMODULE_STRING=\"main\" \
        -DLOCALEDIR=\"$(localedir)\" \
-       -DSYSCONFDIR=\"$(sysconfdir)\" \
        -DPKGDATADIR=\"$(vlcdatadir)\" \
        -DPKGLIBDIR=\"$(vlclibdir)\"
 AM_CFLAGS = $(CFLAGS_libvlccore)

diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index 0c36f01a96c7733319bc643a4b5f57fae1c712f9..01d4260cc0e9697284547b8bcbd2d692e39bf2c5 100644 (file)
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -39,7 +39,6 @@ config_ChainParse
 config_ChainParseOptions
 config_ExistIntf
 config_FindConfig
-config_GetConfDir
 config_GetDataDir
 config_GetLibDir
 config_GetFloat

diff --git a/src/os2/dirs.c b/src/os2/dirs.c
index d4a7669445acc58f686d30f23d48e92e02fa6e8e..39a926206e83655bedccff1e25ac063439ca10fc 100644 (file)
--- a/src/os2/dirs.c
+++ b/src/os2/dirs.c
@@ -64,17 +64,6 @@ char *config_GetDataDir (void)
     return datadir;
 }
 
-/**
- * Determines the system configuration directory.
- *
- * @return a string (always succeeds).
- */
-const char *config_GetConfDir( void )
-{
-#warning FIXME: memory leak
-    return config_GetLibDir ();
-}
-
 char *config_GetUserDir (vlc_userdir_t type)
 {
     switch (type)

diff --git a/src/posix/darwin_dirs.c b/src/posix/darwin_dirs.c
index 0216ab680af4e0d8ed48f4916e3a99c5dd90d963..1c753dee1d17e3b3ea0183ff18230e69b405e365 100644 (file)
--- a/src/posix/darwin_dirs.c
+++ b/src/posix/darwin_dirs.c
@@ -42,21 +42,6 @@
 # define MAXPATHLEN 1024
 #endif
 
-static char *configdir = NULL;
-
-static pthread_once_t once = PTHREAD_ONCE_INIT;
-
-static void init_dirs( void )
-{
-    configdir = config_GetUserDir(VLC_CONFIG_DIR);
-}
-
-const char *config_GetConfDir( void )
-{
-    pthread_once(&once, init_dirs);
-    return configdir;
-}
-
 static char *config_GetLibPath (void)
 {
     /* Get the full program path and name */

diff --git a/src/posix/dirs.c b/src/posix/dirs.c
index 0fd5991eedd4c88f7b99b0b5bcc329416831a381..10b5ac42665c0e09fa57a8dde98b998dbd41c44c 100644 (file)
--- a/src/posix/dirs.c
+++ b/src/posix/dirs.c
@@ -58,16 +58,6 @@ char *config_GetLibDir (void)
 }
 #endif
 
-/**
- * Determines the system configuration directory.
- *
- * @return a string (always succeeds).
- */
-const char *config_GetConfDir( void )
-{
-    return SYSCONFDIR;
-}
-
 static char *config_GetHomeDir (void)
 {
     /* 1/ Try $HOME  */

diff --git a/src/symbian/dirs.c b/src/symbian/dirs.c
index 8413015c815c2335329d75da2a40956efc4f4cc2..2fd2e6f531880c31d55a04fddadb2be7866dd3a5 100644 (file)
--- a/src/symbian/dirs.c
+++ b/src/symbian/dirs.c
@@ -55,16 +55,6 @@ const char *config_GetLibDir (void)
     return "C:\\Sys\\Bin";
 }
 
-/**
- * Determines the system configuration directory.
- *
- * @return a string (always succeeds).
- */
-const char *config_GetConfDir( void )
-{
-    return "C:\\Data\\Others";
-}
-
 char *config_GetUserDir (vlc_userdir_t type)
 {
     switch (type)

diff --git a/src/win32/dirs.c b/src/win32/dirs.c
index b49b0e0f045a286cb53c1441ae26af15fd8cdbc2..90b48bab66b4eb47bac1bd91143571eb1591ca3a 100644 (file)
--- a/src/win32/dirs.c
+++ b/src/win32/dirs.c
@@ -67,26 +67,6 @@ char *config_GetDataDir (void)
     return (path != NULL) ? strdup (path) : config_GetLibDir ();
 }
 
-const char *config_GetConfDir (void)
-{
-    static char appdir[PATH_MAX] = "";
-    wchar_t wdir[MAX_PATH];
-
-#warning FIXME: thread-safety!
-    if (*appdir)
-        return appdir;
-
-    /* Get the "Application Data" folder for all users */
-    if( S_OK == SHGetFolderPathW( NULL, CSIDL_COMMON_APPDATA
-              | CSIDL_FLAG_CREATE, NULL, SHGFP_TYPE_CURRENT, wdir ) )
-    {
-        WideCharToMultiByte (CP_UTF8, 0, wdir, -1,
-                             appdir, PATH_MAX, NULL, NULL);
-        return appdir;
-    }
-    return NULL;
-}
-
 static char *config_GetShellDir (int csidl)
 {
     wchar_t wdir[MAX_PATH];