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

client-conf: Don't report failure from pa_client_conf_load()

Browse source 
pa_context already ignored the return value of pa_client_conf_load(),
so the only places where the return value was not ignored were the
D-Bus server lookup thing and pax11publish. I don't think those cases
are negatively affected if they ignore errors in opening or parsing
client.conf.

pa_client_conf_env() never failed anyway, so returning int was
obviously redundant.
This commit is contained in:
Tanu Kaskinen 2014-06-08 16:32:53 +03:00
parent d02511115c
commit 067e61cb66
4 changed files with 12 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/utils/pax11publish.c
View file

@ -152,15 +152,8 @@ int main(int argc, char *argv[]) {
char hx[PA_NATIVE_COOKIE_LENGTH*2+1];
assert(conf);
if (pa_client_conf_load(conf) < 0) {
fprintf(stderr, _("Failed to load client configuration file.\n"));
goto finish;
}
if (pa_client_conf_env(conf) < 0) {
fprintf(stderr, _("Failed to read environment configuration data.\n"));
goto finish;
}
pa_client_conf_load(conf);
pa_client_conf_env(conf);
pa_x11_del_prop(xcb, screen, "PULSE_SERVER");
pa_x11_del_prop(xcb, screen, "PULSE_SINK");