[polypaudio-commits] r1054 - in /trunk/src: daemon/daemon-conf.c pulse/client-conf.c

[svnmailer-noreply at 0pointer.de]

Author: ossman
Date: Fri Jun 30 10:16:14 2006
New Revision: 1054

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=1054&root=pulseaudio&view=rev
Log:
Make sure we print the file name we actually use.

Modified:
    trunk/src/daemon/daemon-conf.c
    trunk/src/pulse/client-conf.c

Modified: trunk/src/daemon/daemon-conf.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/daemon/daemon-conf.c?rev=1054&root=pulseaudio&r1=1053&r2=1054&view=diff
==============================================================================
--- trunk/src/daemon/daemon-conf.c (original)
+++ trunk/src/daemon/daemon-conf.c Fri Jun 30 10:16:14 2006
@@ -238,7 +238,7 @@
         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;
     }
 

Modified: trunk/src/pulse/client-conf.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/client-conf.c?rev=1054&root=pulseaudio&r1=1053&r2=1054&view=diff
==============================================================================
--- trunk/src/pulse/client-conf.c (original)
+++ trunk/src/pulse/client-conf.c Fri Jun 30 10:16:14 2006
@@ -124,7 +124,7 @@
         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;
     }