summaryrefslogtreecommitdiffstats
path: root/libs/utils
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-07-09 12:49:07 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-07-09 12:49:07 -0700
commitc916e0616468e74a87cec71cefd26150a108edf1 (patch)
treeacf3d694080b65bcc28ac51d4a80ce3d121cfe83 /libs/utils
parente2bf80fb0bfd944ef45d60bdc469d85734527363 (diff)
parentfe811d8bd0da15f14702968a9c7deb02db7eec9f (diff)
downloadframeworks_base-c916e0616468e74a87cec71cefd26150a108edf1.zip
frameworks_base-c916e0616468e74a87cec71cefd26150a108edf1.tar.gz
frameworks_base-c916e0616468e74a87cec71cefd26150a108edf1.tar.bz2
am fe811d8b: Merge change 6603 into donut
Merge commit 'fe811d8bd0da15f14702968a9c7deb02db7eec9f' * commit 'fe811d8bd0da15f14702968a9c7deb02db7eec9f': quick fix; utf8_codepoint_count must be utf8_length
Diffstat (limited to 'libs/utils')
-rw-r--r--libs/utils/String8.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/utils/String8.cpp b/libs/utils/String8.cpp
index 71bf3ce..e908ec1 100644
--- a/libs/utils/String8.cpp
+++ b/libs/utils/String8.cpp
@@ -681,7 +681,7 @@ size_t strnlen32(const char32_t *s, size_t maxlen)
return ss-s;
}
-size_t utf8_codepoint_count(const char *src)
+size_t utf8_length(const char *src)
{
const char *cur = src;
size_t ret = 0;