Privatize psz_configfile

diff --git a/include/vlc_main.h b/include/vlc_main.h
index 1f9ae736b4d9db08f030ab00300ae861d9bc7d16..9039cb8938097dc8e19cd16096e27b823a3a49b3 100644 (file)
--- a/include/vlc_main.h
+++ b/include/vlc_main.h
@@ -43,8 +43,6 @@ struct libvlc_int_t
     char *                 psz_datadir;      ///< user's data directory
     char *                 psz_cachedir;     ///< user's cache directory
 
-    char *                 psz_configfile;   ///< location of config file
-
     playlist_t            *p_playlist;       ///< playlist object
 
     void                 *p_stats_computer;  ///< Input thread computing stats (needs cleanup)

diff --git a/src/config/file.c b/src/config/file.c
index 26b68552e6831a43eb91b80f178193f231b45bd8..57e55b805487363f102551f4249060511159df8f 100644 (file)
--- a/src/config/file.c
+++ b/src/config/file.c
@@ -46,7 +46,7 @@ static inline char *strdupnull (const char *src)
 
 static FILE *config_OpenConfigFile( vlc_object_t *p_obj, const char *mode )
 {
-    char *psz_filename = p_obj->p_libvlc->psz_configfile;
+    char *psz_filename = libvlc_priv (p_obj->p_libvlc)->psz_configfile;
     FILE *p_stream;
 
     if( !psz_filename )
@@ -105,7 +105,7 @@ static FILE *config_OpenConfigFile( vlc_object_t *p_obj, const char *mode )
 #endif
     else if( p_stream != NULL )
     {
-        p_obj->p_libvlc->psz_configfile = psz_filename;
+        libvlc_priv (p_obj->p_libvlc)->psz_configfile = psz_filename;
     }
 
     return p_stream;
@@ -400,7 +400,7 @@ static int SaveConfigFile( vlc_object_t *p_this, const char *psz_module_name,
     /* Acquire config file lock */
     vlc_mutex_lock( &priv->config_lock );
 
-    if( p_this->p_libvlc->psz_configfile == NULL )
+    if( libvlc_priv (p_this->p_libvlc)->psz_configfile == NULL )
     {
         const char *psz_configdir = p_this->p_libvlc->psz_configdir;
         if( !psz_configdir ) /* XXX: This should never happen */

diff --git a/src/libvlc-common.c b/src/libvlc-common.c
index 068392bb18246bdd4e6e81755acc63817542383e..7be719c8a7ade453df102ebc2b31dff23fd27e29 100644 (file)
--- a/src/libvlc-common.c
+++ b/src/libvlc-common.c
@@ -304,7 +304,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
     p_libvlc->psz_configdir  = config_GetConfigDir( p_libvlc );
     p_libvlc->psz_datadir    = config_GetUserDataDir( p_libvlc );
     p_libvlc->psz_cachedir   = config_GetCacheDir( p_libvlc );
-    p_libvlc->psz_configfile = config_GetCustomConfigFile( p_libvlc );
+    priv->psz_configfile = config_GetCustomConfigFile( p_libvlc );
 
     /* Check for plugins cache options */
     if( config_GetInt( p_libvlc, "reset-plugins-cache" ) > 0 )
@@ -1070,7 +1070,7 @@ int libvlc_InternalDestroy( libvlc_int_t *p_libvlc, bool b_release )
     FREENULL( p_libvlc->psz_configdir );
     FREENULL( p_libvlc->psz_datadir );
     FREENULL( p_libvlc->psz_cachedir );
-    FREENULL( p_libvlc->psz_configfile );
+    FREENULL( priv->psz_configfile );
     var_DelCallback( p_libvlc, "key-pressed", vlc_key_to_action,
                      p_libvlc->p_hotkeys );
     FREENULL( p_libvlc->p_hotkeys );

diff --git a/src/libvlc.h b/src/libvlc.h
index 8377dc9e4065a9fa683980c7646d85b3faba4793..9088550afbe9d9edac467efc2a700f4990f92ad8 100644 (file)
--- a/src/libvlc.h
+++ b/src/libvlc.h
@@ -208,7 +208,9 @@ static inline vlc_object_internals_t *vlc_internals( vlc_object_t *obj )
  */
 typedef struct libvlc_priv_t
 {
+    /* Configuration */
     vlc_mutex_t        config_lock; ///< config file lock
+    char *             psz_configfile;   ///< location of config file
 
     /* Messages */
     msg_bank_t         msg_bank;    ///< The message bank