[vlc-devel] commit: Remove useless parameter ( Rémi Denis-Courmont )
git version control
git at videolan.org
Wed May 6 19:31:31 CEST 2009
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed May 6 20:31:21 2009 +0300| [7037664e2f1b1151ecf3e6fa87df9bc50b920a60] | committer: Rémi Denis-Courmont
Remove useless parameter
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7037664e2f1b1151ecf3e6fa87df9bc50b920a60
---
src/config/file.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/config/file.c b/src/config/file.c
index 322f693..482f629 100644
--- a/src/config/file.c
+++ b/src/config/file.c
@@ -67,7 +67,7 @@ static char *config_GetConfigFile( vlc_object_t *obj )
return psz_file;
}
-static FILE *config_OpenConfigFile( vlc_object_t *p_obj, const char *mode )
+static FILE *config_OpenConfigFile( vlc_object_t *p_obj )
{
char *psz_filename = config_GetConfigFile( p_obj );
if( psz_filename == NULL )
@@ -75,7 +75,7 @@ static FILE *config_OpenConfigFile( vlc_object_t *p_obj, const char *mode )
msg_Dbg( p_obj, "opening config file (%s)", psz_filename );
- FILE *p_stream = utf8_fopen( psz_filename, mode );
+ FILE *p_stream = utf8_fopen( psz_filename, "rt" );
if( p_stream == NULL && errno != ENOENT )
{
msg_Err( p_obj, "cannot open config file (%s): %m",
@@ -83,7 +83,7 @@ static FILE *config_OpenConfigFile( vlc_object_t *p_obj, const char *mode )
}
#if !( defined(WIN32) || defined(__APPLE__) || defined(SYS_BEOS) )
- else if( p_stream == NULL && errno == ENOENT && mode[0] == 'r' )
+ else if( p_stream == NULL && errno == ENOENT )
{
/* This is the fallback for pre XDG Base Directory
* Specification configs */
@@ -91,7 +91,7 @@ static FILE *config_OpenConfigFile( vlc_object_t *p_obj, const char *mode )
if( asprintf( &psz_old, "%s" DIR_SEP CONFIG_DIR DIR_SEP CONFIG_FILE,
config_GetHomeDir() ) != -1 )
{
- p_stream = utf8_fopen( psz_old, mode );
+ p_stream = utf8_fopen( psz_old, "rt" );
if( p_stream )
{
/* Old config file found. We want to write it at the
@@ -154,7 +154,7 @@ int __config_LoadConfigFile( vlc_object_t *p_this, const char *psz_module_name )
{
FILE *file;
- file = config_OpenConfigFile (p_this, "rt");
+ file = config_OpenConfigFile (p_this);
if (file == NULL)
return VLC_EGENERIC;
@@ -425,7 +425,7 @@ static int SaveConfigFile( vlc_object_t *p_this, const char *psz_module_name,
goto error;
}
- file = config_OpenConfigFile( p_this, "rt" );
+ file = config_OpenConfigFile( p_this );
if( file != NULL )
{
/* look for file size */
More information about the vlc-devel
mailing list