summaryrefslogtreecommitdiffstats
path: root/polyp/daemon-conf.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2004-11-08 23:48:19 +0000
committerLennart Poettering <lennart@poettering.net>2004-11-08 23:48:19 +0000
commit4bb14837dd09777e45793bda42512d900c6b500e (patch)
tree65a8a5a11b4a99707c009a197335554e6e219f91 /polyp/daemon-conf.c
parentb55923a8d33a1c4ed2f892a0da36c9c679e7d828 (diff)
implemented pax11publish.c
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@275 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'polyp/daemon-conf.c')
-rw-r--r--polyp/daemon-conf.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/polyp/daemon-conf.c b/polyp/daemon-conf.c
index e87acd1d..1c6486b7 100644
--- a/polyp/daemon-conf.c
+++ b/polyp/daemon-conf.c
@@ -182,12 +182,12 @@ int pa_daemon_conf_load(struct pa_daemon_conf *c, const char *filename) {
fopen(c->config_file = pa_xstrdup(filename), "r") :
pa_open_config_file(DEFAULT_CONFIG_FILE, DEFAULT_CONFIG_FILE_USER, ENV_CONFIG_FILE, &c->config_file);
- if (!f && errno != EINTR) {
+ if (!f && errno != ENOENT) {
pa_log(__FILE__": WARNING: failed to open configuration file '%s': %s\n", filename, strerror(errno));
goto finish;
}
- r = pa_config_parse(c->config_file, f, table, NULL);
+ r = f ? pa_config_parse(c->config_file, f, table, NULL) : 0;
finish:
if (f)