* split pa_cstrerror() into its own file polypcore/core-error.[ch]

[pulseaudio] / src / daemon / daemon-conf.c

diff --git a/src/daemon/daemon-conf.c b/src/daemon/daemon-conf.c
index ac5fbb166d7e5a3cf8813624b1fef5577bed9519..2d8d9558c32fbf56224a608b3391ae4b4af7b868 100644 (file)
--- a/src/daemon/daemon-conf.c
+++ b/src/daemon/daemon-conf.c
@@ -29,8 +29,10 @@
 #include <assert.h>
 #include <unistd.h>
 
-#include <polypcore/util.h>
-#include <polypcore/xmalloc.h>
+#include <polyp/xmalloc.h>
+
+#include <polypcore/core-error.h>
+#include <polypcore/core-util.h>
 #include <polypcore/strbuf.h>
 #include <polypcore/conf-parser.h>
 #include <polypcore/resampler.h>
@@ -84,7 +86,7 @@ pa_daemon_conf* pa_daemon_conf_new(void) {
     FILE *f;
     pa_daemon_conf *c = pa_xmemdup(&default_conf, sizeof(default_conf));
 
-    if ((f = pa_open_config_file(DEFAULT_SCRIPT_FILE, DEFAULT_SCRIPT_FILE_USER, ENV_SCRIPT_FILE, &c->default_script_file)))
+    if ((f = pa_open_config_file(DEFAULT_SCRIPT_FILE, DEFAULT_SCRIPT_FILE_USER, ENV_SCRIPT_FILE, &c->default_script_file, "r")))
         fclose(f);
 
 #ifdef DLSEARCHPATH
@@ -233,10 +235,10 @@ int pa_daemon_conf_load(pa_daemon_conf *c, const char *filename) {
 
     f = 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);
+        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, strerror(errno));
+        pa_log(__FILE__": WARNING: failed to open configuration file '%s': %s", filename, pa_cstrerror(errno));
         goto finish;
     }