mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-04 13:29:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

client-conf: Remove redundant function parameters

Browse source
This commit is contained in:
Tanu Kaskinen 2014-03-19 12:19:07 +02:00
parent aca30527e2
commit 0a583fe0c3
8 changed files with 18 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/pulse/client-conf.c
View file

@ -90,7 +90,7 @@ void pa_client_conf_free(pa_client_conf *c) {
pa_xfree(c);
}
int pa_client_conf_load(pa_client_conf *c, const char *filename) {
int pa_client_conf_load(pa_client_conf *c) {
FILE *f = NULL;
char *fn = NULL;
int r = -1;
@ -113,21 +113,9 @@ int pa_client_conf_load(pa_client_conf *c, const char *filename) {
{ NULL, NULL, NULL, NULL },
};
if (filename) {
if (!(f = pa_fopen_cloexec(filename, "r"))) {
pa_log(_("Failed to open configuration file '%s': %s"), fn, pa_cstrerror(errno));
if (!(f = pa_open_config_file(DEFAULT_CLIENT_CONFIG_FILE, DEFAULT_CLIENT_CONFIG_FILE_USER, ENV_CLIENT_CONFIG_FILE, &fn)))
if (errno != ENOENT)
goto finish;
}
fn = pa_xstrdup(fn);
} else {
if (!(f = pa_open_config_file(DEFAULT_CLIENT_CONFIG_FILE, DEFAULT_CLIENT_CONFIG_FILE_USER, ENV_CLIENT_CONFIG_FILE, &fn)))
if (errno != ENOENT)
goto finish;
}
r = f ? pa_config_parse(fn, f, table, NULL, NULL) : 0;