lib: unichar - Move uni_ucs4_decompose_one_utf8() to unicode-transform.c

diff --git a/src/lib/unichar.c b/src/lib/unichar.c
index 43da11443ec8ed4979a73099b2c2744f7bf73945..e1aec6371e005cec98e5c67b4fa94f6242c1cd8e 100644 (file)
--- a/src/lib/unichar.c
+++ b/src/lib/unichar.c
@@ -239,28 +239,6 @@ unichar_t uni_ucs4_to_titlecase(unichar_t chr)
 
 #include "unicode-transform.c"
 
-static void
-uni_ucs4_decompose_one_utf8(unichar_t chr, bool canonical, buffer_t *output)
-{
-       const unichar_t *decomp;
-       size_t len, i;
-
-       if (chr >= HANGUL_FIRST && chr <= HANGUL_LAST) {
-               uni_ucs4_decompose_hangul_utf8(chr, output);
-               return;
-       }
-
-       len = unicode_code_point_get_full_decomposition(chr, canonical,
-                                                       &decomp);
-       if (len == 0) {
-               uni_ucs4_to_utf8_c(chr, output);
-               return;
-       }
-
-       for (i = 0; i < len; i++)
-               uni_ucs4_to_utf8_c(decomp[i], output);
-}
-
 static void output_add_replacement_char(buffer_t *output)
 {
        if (output->used >= UTF8_REPLACEMENT_CHAR_LEN &&

diff --git a/src/lib/unicode-transform.c b/src/lib/unicode-transform.c
index 5bc2bff00a565884e4722dcfdd04df8019603f00..6bdcd39a28e7b21f23d6d0afea31c395babf0cc8 100644 (file)
--- a/src/lib/unicode-transform.c
+++ b/src/lib/unicode-transform.c
@@ -52,3 +52,25 @@ static void uni_ucs4_decompose_hangul_utf8(unichar_t chr, buffer_t *output)
        for (i = 0; i < len; i++)
                uni_ucs4_to_utf8_c(buf[i], output);
 }
+
+static void
+uni_ucs4_decompose_one_utf8(unichar_t chr, bool canonical, buffer_t *output)
+{
+       const unichar_t *decomp;
+       size_t len, i;
+
+       if (chr >= HANGUL_FIRST && chr <= HANGUL_LAST) {
+               uni_ucs4_decompose_hangul_utf8(chr, output);
+               return;
+       }
+
+       len = unicode_code_point_get_full_decomposition(chr, canonical,
+                                                       &decomp);
+       if (len == 0) {
+               uni_ucs4_to_utf8_c(chr, output);
+               return;
+       }
+
+       for (i = 0; i < len; i++)
+               uni_ucs4_to_utf8_c(decomp[i], output);
+}