Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
7037664e
Commit
7037664e
authored
May 06, 2009
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove useless parameter
parent
b8247ace
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
src/config/file.c
src/config/file.c
+6
-6
No files found.
src/config/file.c
View file @
7037664e
...
@@ -67,7 +67,7 @@ static char *config_GetConfigFile( vlc_object_t *obj )
...
@@ -67,7 +67,7 @@ static char *config_GetConfigFile( vlc_object_t *obj )
return
psz_file
;
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
);
char
*
psz_filename
=
config_GetConfigFile
(
p_obj
);
if
(
psz_filename
==
NULL
)
if
(
psz_filename
==
NULL
)
...
@@ -75,7 +75,7 @@ static FILE *config_OpenConfigFile( vlc_object_t *p_obj, const char *mode )
...
@@ -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
);
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
)
if
(
p_stream
==
NULL
&&
errno
!=
ENOENT
)
{
{
msg_Err
(
p_obj
,
"cannot open config file (%s): %m"
,
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 )
...
@@ -83,7 +83,7 @@ static FILE *config_OpenConfigFile( vlc_object_t *p_obj, const char *mode )
}
}
#if !( defined(WIN32) || defined(__APPLE__) || defined(SYS_BEOS) )
#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
/* This is the fallback for pre XDG Base Directory
* Specification configs */
* Specification configs */
...
@@ -91,7 +91,7 @@ static FILE *config_OpenConfigFile( vlc_object_t *p_obj, const char *mode )
...
@@ -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
,
if
(
asprintf
(
&
psz_old
,
"%s"
DIR_SEP
CONFIG_DIR
DIR_SEP
CONFIG_FILE
,
config_GetHomeDir
()
)
!=
-
1
)
config_GetHomeDir
()
)
!=
-
1
)
{
{
p_stream
=
utf8_fopen
(
psz_old
,
mode
);
p_stream
=
utf8_fopen
(
psz_old
,
"rt"
);
if
(
p_stream
)
if
(
p_stream
)
{
{
/* Old config file found. We want to write it at the
/* 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 )
...
@@ -154,7 +154,7 @@ int __config_LoadConfigFile( vlc_object_t *p_this, const char *psz_module_name )
{
{
FILE
*
file
;
FILE
*
file
;
file
=
config_OpenConfigFile
(
p_this
,
"rt"
);
file
=
config_OpenConfigFile
(
p_this
);
if
(
file
==
NULL
)
if
(
file
==
NULL
)
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
...
@@ -425,7 +425,7 @@ static int SaveConfigFile( vlc_object_t *p_this, const char *psz_module_name,
...
@@ -425,7 +425,7 @@ static int SaveConfigFile( vlc_object_t *p_this, const char *psz_module_name,
goto
error
;
goto
error
;
}
}
file
=
config_OpenConfigFile
(
p_this
,
"rt"
);
file
=
config_OpenConfigFile
(
p_this
);
if
(
file
!=
NULL
)
if
(
file
!=
NULL
)
{
{
/* look for file size */
/* look for file size */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment