tests: modify rtpoll-test to use 'check' framework

[pulseaudio] / src / pulse / utf8.c

diff --git a/src/pulse/utf8.c b/src/pulse/utf8.c
index 9dddf4a3f3ee8b0191409d4aaa3d14d843c79c6c..773a1f8383f4df998d5d552873aca72723d04f7d 100644 (file)
--- a/src/pulse/utf8.c
+++ b/src/pulse/utf8.c
@@ -148,12 +148,9 @@ ONE_REMAINING:
 
             if (o) {
                 memcpy(o, last, (size_t) size);
-                o += size - 1;
+                o += size;
             }
 
-            if (o)
-                o++;
-
             continue;
 
 error:
@@ -252,11 +249,16 @@ char* pa_locale_to_utf8 (const char *str) {
 
 char* pa_utf8_to_locale (const char *str) {
     pa_assert(str);
-    return NULL;
+
+    return pa_ascii_filter(str);
 }
 
 char* pa_locale_to_utf8 (const char *str) {
     pa_assert(str);
+
+    if (pa_utf8_valid(str))
+        return pa_xstrdup(str);
+
     return NULL;
 }