[vlc-devel] commit: Refactor ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed May  6 19:09:37 2009 +0300| [9a9570009287f6ea810c725afae86556c454e39a] | committer: Rémi Denis-Courmont 

Refactor

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9a9570009287f6ea810c725afae86556c454e39a
---

 src/config/file.c |   23 +++++++++++++----------
 1 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/config/file.c b/src/config/file.c
index 7b2fa4c..db9baa9 100644
--- a/src/config/file.c
+++ b/src/config/file.c
@@ -52,22 +52,25 @@ static inline char *strdupnull (const char *src)
 /**
  * Get the user's configuration file
  */
-static char *config_GetConfigFile( void )
+static char *config_GetConfigFile( vlc_object_t *obj )
 {
-    char *psz_dir = config_GetUserConfDir();
-    char *psz_configfile;
+    char *psz_file = config_GetPsz( obj, "config" );
+    if( psz_file == NULL )
+    {
+        char *psz_dir = config_GetUserConfDir();
 
-    if( asprintf( &psz_configfile, "%s" DIR_SEP CONFIG_FILE, psz_dir ) == -1 )
-        psz_configfile = NULL;
-    free( psz_dir );
-    return psz_configfile;
+        if( asprintf( &psz_file, "%s" DIR_SEP CONFIG_FILE, psz_dir ) == -1 )
+            psz_file = NULL;
+        free( psz_dir );
+    }
+    return psz_file;
 }
 
 static FILE *config_OpenConfigFile( vlc_object_t *p_obj, const char *mode )
 {
-    char *psz_filename = config_GetPsz( p_obj, "config" );
-    if( !psz_filename )
-        psz_filename = config_GetConfigFile();
+    char *psz_filename = config_GetConfigFile( p_obj );
+    if( psz_filename == NULL )
+        return NULL;
 
     msg_Dbg( p_obj, "opening config file (%s)", psz_filename );