commit 1ec1f3dec4ec6e1e5ed45b4d859a9f433e085354
author Daisuke Miyakawa <dmiyakawa@google.com> Thu Jul 09 14:03:07 2009 +0900
committer Daisuke Miyakawa <dmiyakawa@google.com> Thu Jul 09 14:03:07 2009 +0900
tree 368e5e461a600b104853fe8ff24655eb509e92d2
parent e919af569c13d7445daf20cb06867e186afba92a

quick fix

android/PhoneticStringUtils.cpp

diff --git a/android/PhoneticStringUtils.cpp b/android/PhoneticStringUtils.cpp
index fa32d38..da5767f 100644
--- a/android/PhoneticStringUtils.cpp
+++ b/android/PhoneticStringUtils.cpp
@@ -294,14 +294,14 @@
 
     char32_t codepoints[MAX_CODEPOINTS];
 
-    size_t src_len = GetUtf8LengthOrZero(src);
+    size_t src_len = utf8_length(src);
     if (src_len == 0) {
         return false;
     }
     bool next_is_consumed;
     size_t j = 0;
     for (size_t i = 0; i < src_len;) {
-        int32_t ret = GetUtf32AtFromUtf8(src, src_len, i, &i);
+        int32_t ret = utf32_at(src, src_len, i, &i);
         if (ret < 0) {
             // failed to parse UTF-8
             return false;
@@ -327,14 +327,13 @@
         length = 1;
     }
 
-    size_t new_len = GetUtf8LengthFromUtf32(codepoints, length);
+    size_t new_len = utf8_length_from_utf32(codepoints, length);
     *dst = static_cast<char *>(malloc(new_len + 1));
     if (*dst == NULL) {
         return false;
     }
 
-    printf("new_len: %u\n", new_len);
-    if (GetUtf8FromUtf32(codepoints, length, *dst, new_len + 1) != new_len) {
+    if (utf32_to_utf8(codepoints, length, *dst, new_len + 1) != new_len) {
         free(*dst);
         *dst = NULL;
         return false;

android/PhoneticStringUtilsTest.cpp

diff --git a/android/PhoneticStringUtilsTest.cpp b/android/PhoneticStringUtilsTest.cpp
index 06a7ba8..5665fb9 100644
--- a/android/PhoneticStringUtilsTest.cpp
+++ b/android/PhoneticStringUtilsTest.cpp
@@ -31,7 +31,7 @@
  private:
   void DoOneTest(void (TestExecutor::*test)());
 
-  void testGetUtf32At();
+  void testUtf32At();
   void testGetPhoneticallySortableCodePointAscii();
   void testGetPhoneticallySortableCodePointKana();
   void testGetPhoneticallySortableCodePointWhitespaceOnly();
@@ -67,7 +67,7 @@
 
 
 bool TestExecutor::DoAllTests() {
-  DoOneTest(&TestExecutor::testGetUtf32At);
+  DoOneTest(&TestExecutor::testUtf32At);
   DoOneTest(&TestExecutor::testGetPhoneticallySortableCodePointAscii);
   DoOneTest(&TestExecutor::testGetPhoneticallySortableCodePointKana);
   DoOneTest(&TestExecutor::testGetPhoneticallySortableCodePointWhitespaceOnly);
@@ -97,8 +97,7 @@
 #define TEST_GET_UTF32AT(src, index, expected_next, expected_value)     \
   ({                                                                    \
     size_t next;                                                        \
-    String8 string8(src);                                               \
-    int32_t ret = string8.getUtf32At((index), &next);                   \
+    int32_t ret = utf32_at(src, strlen(src), index, &next);   \
     if (ret < 0) {                                                      \
       printf("getUtf32At() returned negative value (src: %s, index: %d)\n", \
              (src), (index));                                           \
@@ -111,8 +110,8 @@
     }                                                                   \
    })
 
-void TestExecutor::testGetUtf32At() {
-  printf("testGetUtf32At()\n");
+void TestExecutor::testUtf32At() {
+  printf("testUtf32At()\n");
 
   TEST_GET_UTF32AT("a", 0, 1, 97);
   // Japanese hiragana "a"