From 4e3dc7ce68561c16254712d713b2ccd472b8afe7 Mon Sep 17 00:00:00 2001
From: Pierre Ossman <ossman@cendio.se>
Date: Mon, 22 May 2006 15:20:46 +0000
Subject: Wrap strerror() in a function that makes it thread safe and converts
 the output to UTF-8.

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@945 fefdeb5f-60dc-0310-8127-8f9354f1896f
---
 src/daemon/caps.c        | 4 +++-
 src/daemon/cpulimit.c    | 4 +++-
 src/daemon/daemon-conf.c | 3 ++-
 src/daemon/main.c        | 5 +++--
 4 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'src/daemon')

diff --git a/src/daemon/caps.c b/src/daemon/caps.c
index 8740b7e8..4942868c 100644
--- a/src/daemon/caps.c
+++ b/src/daemon/caps.c
@@ -32,6 +32,8 @@
 #include <sys/capability.h>
 #endif
 
+#include <polyp/error.h>
+
 #include <polypcore/log.h>
 
 #include "caps.h"
@@ -110,7 +112,7 @@ int pa_drop_caps(void) {
     cap_clear(caps);
 
     if (cap_set_proc(caps) < 0) {
-        pa_log(__FILE__": failed to drop capabilities: %s", strerror(errno));
+        pa_log(__FILE__": failed to drop capabilities: %s", pa_cstrerror(errno));
         goto fail;
     }
     
diff --git a/src/daemon/cpulimit.c b/src/daemon/cpulimit.c
index 69973384..2cc37be6 100644
--- a/src/daemon/cpulimit.c
+++ b/src/daemon/cpulimit.c
@@ -23,6 +23,8 @@
 #include <config.h>
 #endif
 
+#include <polyp/error.h>
+
 #include <polypcore/core-util.h>
 #include <polypcore/log.h>
 
@@ -169,7 +171,7 @@ int pa_cpu_limit_init(pa_mainloop_api *m) {
 
     /* Prepare the main loop pipe */
     if (pipe(the_pipe) < 0) {
-        pa_log(__FILE__": pipe() failed: %s", strerror(errno));
+        pa_log(__FILE__": pipe() failed: %s", pa_cstrerror(errno));
         return -1;
     }
 
diff --git a/src/daemon/daemon-conf.c b/src/daemon/daemon-conf.c
index 0f4fcb97..809769f8 100644
--- a/src/daemon/daemon-conf.c
+++ b/src/daemon/daemon-conf.c
@@ -29,6 +29,7 @@
 #include <assert.h>
 #include <unistd.h>
 
+#include <polyp/error.h>
 #include <polyp/xmalloc.h>
 
 #include <polypcore/core-util.h>
@@ -237,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, strerror(errno));
+        pa_log(__FILE__": WARNING: failed to open configuration file '%s': %s", filename, pa_cstrerror(errno));
         goto finish;
     }
 
diff --git a/src/daemon/main.c b/src/daemon/main.c
index b4bc4e00..2fadd496 100644
--- a/src/daemon/main.c
+++ b/src/daemon/main.c
@@ -50,6 +50,7 @@
 
 #include "../polypcore/winsock.h"
 
+#include <polyp/error.h>
 #include <polyp/mainloop.h>
 #include <polyp/mainloop-signal.h>
 #include <polyp/xmalloc.h>
@@ -286,7 +287,7 @@ int main(int argc, char *argv[]) {
         }
         
         if ((child = fork()) < 0) {
-            pa_log(__FILE__": fork() failed: %s", strerror(errno));
+            pa_log(__FILE__": fork() failed: %s", pa_cstrerror(errno));
             goto finish;
         }
 
@@ -297,7 +298,7 @@ int main(int argc, char *argv[]) {
             daemon_pipe[1] = -1;
 
             if (pa_loop_read(daemon_pipe[0], &retval, sizeof(retval)) != sizeof(retval)) {
-                pa_log(__FILE__": read() failed: %s", strerror(errno));
+                pa_log(__FILE__": read() failed: %s", pa_cstrerror(errno));
                 retval = 1;
             }
 
-- 
cgit