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/utils/pacmd.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'src/utils')

diff --git a/src/utils/pacmd.c b/src/utils/pacmd.c
index 539d205e..351d79da 100644
--- a/src/utils/pacmd.c
+++ b/src/utils/pacmd.c
@@ -32,6 +32,7 @@
 #include <string.h>
 #include <sys/un.h>
 
+#include <polyp/error.h>
 #include <polyp/util.h>
 
 #include <polypcore/core-util.h>
@@ -53,7 +54,7 @@ int main(PA_GCC_UNUSED int argc, PA_GCC_UNUSED char*argv[]) {
     }
 
     if ((fd = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) {
-        pa_log(__FILE__": socket(PF_UNIX, SOCK_STREAM, 0): %s", strerror(errno));
+        pa_log(__FILE__": socket(PF_UNIX, SOCK_STREAM, 0): %s", pa_cstrerror(errno));
         goto fail;
     }
 
@@ -65,7 +66,7 @@ int main(PA_GCC_UNUSED int argc, PA_GCC_UNUSED char*argv[]) {
         int r;
         
         if ((r = connect(fd, (struct sockaddr*) &sa, sizeof(sa))) < 0 && (errno != ECONNREFUSED && errno != ENOENT)) {
-            pa_log(__FILE__": connect() failed: %s", strerror(errno));
+            pa_log(__FILE__": connect(): %s", pa_cstrerror(errno));
             goto fail;
         }
             
@@ -96,7 +97,7 @@ int main(PA_GCC_UNUSED int argc, PA_GCC_UNUSED char*argv[]) {
     
     for (;;) {
         if (select(FD_SETSIZE, &ifds, &ofds, NULL, NULL) < 0) {
-            pa_log(__FILE__": select() failed: %s", strerror(errno));
+            pa_log(__FILE__": select(): %s", pa_cstrerror(errno));
             goto fail;
         }
 
@@ -108,7 +109,7 @@ int main(PA_GCC_UNUSED int argc, PA_GCC_UNUSED char*argv[]) {
                 if (r == 0)
                     break;
                 
-                pa_log(__FILE__": read() failed: %s", strerror(errno));
+                pa_log(__FILE__": read(): %s", pa_cstrerror(errno));
                 goto fail;
             }
             
@@ -124,7 +125,7 @@ int main(PA_GCC_UNUSED int argc, PA_GCC_UNUSED char*argv[]) {
                 if (r == 0)
                     break;
                 
-                pa_log(__FILE__": read() failed: %s", strerror(errno));
+                pa_log(__FILE__": read(): %s", pa_cstrerror(errno));
                 goto fail;
             }
 
@@ -137,7 +138,7 @@ int main(PA_GCC_UNUSED int argc, PA_GCC_UNUSED char*argv[]) {
             assert(obuf_length);
             
             if ((r = write(1, obuf + obuf_index, obuf_length)) < 0) {
-                pa_log(__FILE__": write() failed: %s", strerror(errno));
+                pa_log(__FILE__": write(): %s", pa_cstrerror(errno));
                 goto fail;
             }
             
@@ -151,7 +152,7 @@ int main(PA_GCC_UNUSED int argc, PA_GCC_UNUSED char*argv[]) {
             assert(ibuf_length);
             
             if ((r = write(fd, ibuf + ibuf_index, ibuf_length)) < 0) {
-                pa_log(__FILE__": write() failed: %s", strerror(errno));
+                pa_log(__FILE__": write(): %s", pa_cstrerror(errno));
                 goto fail;
             }
             
-- 
cgit