diff options
author | Pierre Ossman <ossman@cendio.se> | 2006-06-30 08:16:14 +0000 |
---|---|---|
committer | Pierre Ossman <ossman@cendio.se> | 2006-06-30 08:16:14 +0000 |
commit | 8b0d1346022d0eb3f3b4bf3eb956f9757ff57156 (patch) | |
tree | a3347ccebfa20a4962e1e6eca5998987ee5fbff9 | |
parent | 18b8b84b7e3885165ef14cd7c25fa34f1ce36b61 (diff) |
Make sure we print the file name we actually use.
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1054 fefdeb5f-60dc-0310-8127-8f9354f1896f
-rw-r--r-- | src/daemon/daemon-conf.c | 2 | ||||
-rw-r--r-- | src/pulse/client-conf.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/daemon/daemon-conf.c b/src/daemon/daemon-conf.c index 64e8d235..d1afed7b 100644 --- a/src/daemon/daemon-conf.c +++ b/src/daemon/daemon-conf.c @@ -238,7 +238,7 @@ int pa_daemon_conf_load(pa_daemon_conf *c, const char *filename) { pa_open_config_file(DEFAULT_CONFIG_FILE, DEFAULT_CONFIG_FILE_USER, ENV_CONFIG_FILE, &c->config_file, "r"); if (!f && errno != ENOENT) { - pa_log(__FILE__": WARNING: failed to open configuration file '%s': %s", filename, pa_cstrerror(errno)); + pa_log(__FILE__": WARNING: failed to open configuration file '%s': %s", c->config_file, pa_cstrerror(errno)); goto finish; } diff --git a/src/pulse/client-conf.c b/src/pulse/client-conf.c index e150a9cc..5cebcf46 100644 --- a/src/pulse/client-conf.c +++ b/src/pulse/client-conf.c @@ -124,7 +124,7 @@ int pa_client_conf_load(pa_client_conf *c, const char *filename) { pa_open_config_file(DEFAULT_CLIENT_CONFIG_FILE, DEFAULT_CLIENT_CONFIG_FILE_USER, ENV_CLIENT_CONFIG_FILE, &fn, "r"); if (!f && errno != EINTR) { - pa_log(__FILE__": WARNING: failed to open configuration file '%s': %s", filename, pa_cstrerror(errno)); + pa_log(__FILE__": WARNING: failed to open configuration file '%s': %s", fn, pa_cstrerror(errno)); goto finish; } |