diff options
| author | Justin DeMartino <jjdemartino@google.com> | 2020-10-14 19:39:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-10-14 19:39:53 +0000 |
| commit | 0d11af03e43f110b0bb160f7e20436d0043e3038 (patch) | |
| tree | 48f8bcca856276ec73a86dd3fb26143d3ca64578 /libutils/Unicode.cpp | |
| parent | 075666ebd0dee8d0c4a2efa54f7c324a3f67ee2a (diff) | |
| parent | a6c01e4e98d2b343dcecfc99611e2e6250c730db (diff) | |
Merge changes from topic "SP1A.200921.001" into s-keystone-qcom-dev
* changes:
fs_mgr: adb-remount-test.sh: filter out more administrivia mounts.
Merge SP1A.200921.001 Change-Id: I90b97c4e9fb10b1f45e74def404823eed5b1aaa8
Diffstat (limited to 'libutils/Unicode.cpp')
| -rw-r--r-- | libutils/Unicode.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libutils/Unicode.cpp b/libutils/Unicode.cpp index b08e061c0..b6e457b04 100644 --- a/libutils/Unicode.cpp +++ b/libutils/Unicode.cpp @@ -162,9 +162,9 @@ int32_t utf32_from_utf8_at(const char *src, size_t src_len, size_t index, size_t if (index >= src_len) { return -1; } - size_t dummy_index; + size_t unused_index; if (next_index == nullptr) { - next_index = &dummy_index; + next_index = &unused_index; } size_t num_read; int32_t ret = utf32_at_internal(src + index, &num_read); |