Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
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-gpu
Commits
080a076a
Commit
080a076a
authored
May 06, 2008
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
config_GetConfigFile: remove unused parameter
parent
146dad54
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
16 deletions
+15
-16
src/config/configuration.h
src/config/configuration.h
+0
-1
src/config/file.c
src/config/file.c
+15
-15
No files found.
src/config/configuration.h
View file @
080a076a
...
...
@@ -44,7 +44,6 @@ void config_UnsetCallbacks( module_config_t *, size_t );
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
View file @
080a076a
...
...
@@ -44,6 +44,20 @@ static inline char *strdupnull (const char *src)
return
src
?
strdup
(
src
)
:
NULL
;
}
/**
* 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
)
{
char
*
psz_filename
=
libvlc_priv
(
p_obj
->
p_libvlc
)
->
psz_configfile
;
...
...
@@ -51,7 +65,7 @@ static FILE *config_OpenConfigFile( vlc_object_t *p_obj, const char *mode )
if
(
!
psz_filename
)
{
psz_filename
=
config_GetConfigFile
(
p_obj
->
p_libvlc
);
psz_filename
=
config_GetConfigFile
();
}
msg_Dbg
(
p_obj
,
"opening config file (%s)"
,
psz_filename
);
...
...
@@ -665,20 +679,6 @@ int __config_SaveConfigFile( vlc_object_t *p_this, const char *psz_module_name )
return
SaveConfigFile
(
p_this
,
psz_module_name
,
false
);
}
/**
* 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
*/
...
...
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