diff options
author | Tanu Kaskinen <tanu.kaskinen@linux.intel.com> | 2014-06-08 16:32:53 +0300 |
---|---|---|
committer | Tanu Kaskinen <tanu.kaskinen@linux.intel.com> | 2014-06-24 13:13:04 +0300 |
commit | 067e61cb668c426e3a03c54cead2e2102485d5f7 (patch) | |
tree | 67513b92070921ba088bfeab3bc8d8b5bc759905 /src/utils | |
parent | d02511115c30246339a4cd8185665894ab105979 (diff) | |
download | pulseaudio-067e61cb668c426e3a03c54cead2e2102485d5f7.tar.gz |
client-conf: Don't report failure from pa_client_conf_load()
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.
Diffstat (limited to 'src/utils')
-rw-r--r-- | src/utils/pax11publish.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/utils/pax11publish.c b/src/utils/pax11publish.c index f79975dd0..e4f9943b9 100644 --- a/src/utils/pax11publish.c +++ b/src/utils/pax11publish.c @@ -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"); |