Changeset 0038469d31d5ede7c49c5133c90e70d8a0a543dc

Timestamp:

06/05/08 22:15:51 (7 months ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1210104951 +0300

git-parent:

[75c438d3302e2a816a473576a35e17989d05a42c]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1210104036 +0300

Message:

Use config_GetUserConfDir internally too

Files:

• src/config/file.c (modified) (4 diffs)
• src/libvlc-common.c (modified) (2 diffs)
• src/libvlc.h (modified) (1 diff)

src/config/file.c

@@ -93 +93 @@
-                                 "copied to the new location:\n%s\nYou can "
-                                 "delete this directory and all its contents.",
-libvlc_priv(p_obj->p_libvlc)->psz_configdir
+psz_filename
-                        fclose( p_readme );
-                    }
@@ -402 +402 @@
-    if( libvlc_priv (p_this->p_libvlc)->psz_configfile == NULL )
-    {
-
-
+
-        if( !psz_configdir ) /* XXX: This should never happen */
-        {
@@ -412 +411 @@
-
-        config_CreateDir( p_this, psz_configdir );
+        free( psz_configdir );
-    }
-
@@ -671 +671 @@
-char *config_GetConfigFile( libvlc_int_t *p_libvlc )
-{
+    char *psz_dir = config_GetUserConfDir();
-    char *psz_configfile;
-
-
-
+
+
+
+
-    return psz_configfile;
-}

src/libvlc-common.c

@@ -297 +297 @@
-    /* Set the config file stuff */
-    p_libvlc->psz_homedir    = config_GetHomeDir();
-    priv->psz_configdir  = config_GetUserConfDir();
-    priv->psz_datadir    = config_GetUserDataDir();
-    priv->psz_configfile = config_GetCustomConfigFile( p_libvlc );
@@ -1062 +1061 @@
-
-    FREENULL( p_libvlc->psz_homedir );
-    free( priv->psz_configdir );
-    free( priv->psz_datadir );
-    FREENULL( priv->psz_configfile );

src/libvlc.h

@@ -212 +212 @@
-    vlc_mutex_t        config_lock; ///< config file lock
-    char *             psz_configfile;   ///< location of config file
-    char              *psz_configdir;    ///< user configuration directory
-    char              *psz_datadir;      ///< user data directory
-