[vlc-devel] commit: Cosmetics ( Rémi Denis-Courmont )
git version control
git at videolan.org
Mon Aug 24 21:02:51 CEST 2009
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Aug 24 21:40:52 2009 +0300| [821f7242a79241034415b46f5683ec485f75e760] | committer: Rémi Denis-Courmont
Cosmetics
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=821f7242a79241034415b46f5683ec485f75e760
---
src/config/dirs.c | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/config/dirs.c b/src/config/dirs.c
index a6314ba..341fe00 100644
--- a/src/config/dirs.c
+++ b/src/config/dirs.c
@@ -215,14 +215,7 @@ static char *config_GetHomeDir (void)
#endif
}
-char *config_GetUserDir (vlc_userdir_t type)
-{
- char *home = config_GetHomeDir ();
- (void)type;
- return home;
-}
-
-static char *config_GetFooDir (const char *xdg_name, const char *xdg_default)
+static char *config_GetAppDir (const char *xdg_name, const char *xdg_default)
{
char *psz_dir;
#if defined(WIN32) || defined(__APPLE__) || defined(SYS_BEOS)
@@ -246,7 +239,7 @@ static char *config_GetFooDir (const char *xdg_name, const char *xdg_default)
return psz_dir;
}
- psz_home = config_GetUserDir (VLC_HOME_DIR);
+ psz_home = config_GetHomeDir ();
if( psz_home == NULL
|| asprintf( &psz_dir, "%s/%s/vlc", psz_home, xdg_default ) == -1 )
psz_dir = NULL;
@@ -260,7 +253,7 @@ static char *config_GetFooDir (const char *xdg_name, const char *xdg_default)
*/
char *config_GetUserConfDir( void )
{
- return config_GetFooDir ("CONFIG", ".config");
+ return config_GetAppDir ("CONFIG", ".config");
}
/**
@@ -269,7 +262,7 @@ char *config_GetUserConfDir( void )
*/
char *config_GetUserDataDir( void )
{
- return config_GetFooDir ("DATA", ".local/share");
+ return config_GetAppDir ("DATA", ".local/share");
}
/**
@@ -287,6 +280,13 @@ char *config_GetCacheDir( void )
return psz_dir;
#else
- return config_GetFooDir ("CACHE", ".cache");
+ return config_GetAppDir ("CACHE", ".cache");
#endif
}
+
+char *config_GetUserDir (vlc_userdir_t type)
+{
+ char *home = config_GetHomeDir ();
+ (void)type;
+ return home;
+}
More information about the vlc-devel
mailing list