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

diff --git a/src/daemon/daemon-conf.c b/src/daemon/daemon-conf.c
index 64e8d2356786d6c4b8719f05bea54310763f1178..d1afed7b1ad5bb7f043cc4e9dc08ee4a4eddb7c4 100644 (file)
--- 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 e150a9cc08a07414aa2f13a6783d043e6d805907..5cebcf460506651cb914f1dafbf111c59ea11132 100644 (file)
--- 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;
     }