@@ -205,11 +205,11 @@
 					return nil;
 				}
 
 				/* Normal character */
 				if ((c1 & 0xFC00) != 0xD800) {
-					l = of_string_unicode_to_utf8(c1,
+					l = of_string_utf8_encode(c1,
 					    buffer + i);
 					if (l == 0) {
 						free(buffer);
 						return nil;
 					}
@@ -232,11 +232,11 @@
 				}
 
 				c = (((c1 & 0x3FF) << 10) |
 				    (c2 & 0x3FF)) + 0x10000;
 
-				l = of_string_unicode_to_utf8(c, buffer + i);
+				l = of_string_utf8_encode(c, buffer + i);
 				if (l == 0) {
 					free(buffer);
 					return nil;
 				}
 
@@ -329,11 +329,11 @@
 				return nil;
 			}
 
 			/* Normal character */
 			if ((c1 & 0xFC00) != 0xD800) {
-				l = of_string_unicode_to_utf8(c1, buffer + i);
+				l = of_string_utf8_encode(c1, buffer + i);
 				if (l == 0) {
 					free(buffer);
 					return nil;
 				}
 
@@ -354,11 +354,11 @@
 				return nil;
 			}
 
 			c = (((c1 & 0x3FF) << 10) | (c2 & 0x3FF)) + 0x10000;
 
-			l = of_string_unicode_to_utf8(c, buffer + i);
+			l = of_string_utf8_encode(c, buffer + i);
 			if (l == 0) {
 				free(buffer);
 				return nil;
 			}