Changeset 080a076a49837a7643778b78db14727017ec2bfb

Timestamp:

05/06/08 22:15:52 (2 months ago)

Author:

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

git-committer:

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

git-parent:

[146dad54bff773b990752e44b92aa35f87cbc678]

git-author:

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

Message:

config_GetConfigFile: remove unused parameter

Files:

• src/config/configuration.h (modified) (1 diff)
• src/config/file.c (modified) (3 diffs)

src/config/configuration.h

@@ -45 +45 @@
-int __config_LoadCmdLine   ( vlc_object_t *, int *, const char *[], bool );
-char *config_GetHomeDir    ( void );
-char *config_GetConfigFile ( libvlc_int_t * );
-char *config_GetCustomConfigFile( libvlc_int_t * );
-int __config_LoadConfigFile( vlc_object_t *, const char * );

src/config/file.c

@@ -45 +45 @@
-}
-
+/**
+ * Get the user's configuration file
+ */
+static char *config_GetConfigFile( void )
+{
+    char *psz_dir = config_GetUserConfDir();
+    char *psz_configfile;
+
+    if( asprintf( &psz_configfile, "%s" DIR_SEP CONFIG_FILE, psz_dir ) == -1 )
+        psz_configfile = NULL;
+    free( psz_dir );
+    return psz_configfile;
+}
+
-static FILE *config_OpenConfigFile( vlc_object_t *p_obj, const char *mode )
-{
@@ -52 +66 @@
-    if( !psz_filename )
-    {
- p_obj->p_libvlc 
+
-    }
-
@@ -667 +681 @@
-
-/**
- * Get the user's configuration file
- */
-char *config_GetConfigFile( libvlc_int_t *p_libvlc )
-{
-    char *psz_dir = config_GetUserConfDir();
-    char *psz_configfile;
-
-    if( asprintf( &psz_configfile, "%s" DIR_SEP CONFIG_FILE, psz_dir ) == -1 )
-        psz_configfile = NULL;
-    free( psz_dir );
-    return psz_configfile;
-}
-
-/**
- * Get the user's configuration file when given with the --config option
- */