diff options
| author | Ian Rogers <irogers@google.com> | 2013-10-31 12:37:54 -0700 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2013-10-31 12:37:54 -0700 |
| commit | cf5077ac14f0922b6104a8a03fd66d97a490a3dd (patch) | |
| tree | e5a4c42b87f06dcf5dd8bce1de992d3e2a2430fa /runtime/dex_file.cc | |
| parent | 1b8cb967143d5c46db1db8ac940a73d111be3628 (diff) | |
| download | art-cf5077ac14f0922b6104a8a03fd66d97a490a3dd.zip art-cf5077ac14f0922b6104a8a03fd66d97a490a3dd.tar.gz art-cf5077ac14f0922b6104a8a03fd66d97a490a3dd.tar.bz2 | |
Remove unused length from DexFile GetString calls.
Address extra review comments from commit
dfb325e0ddd746cd8f7c2e3723b3a573eb7cc111.
Change-Id: If76e81e7af5870431901de0bf561e0f827435fe3
Diffstat (limited to 'runtime/dex_file.cc')
| -rw-r--r-- | runtime/dex_file.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/runtime/dex_file.cc b/runtime/dex_file.cc index d3bb483..7e09a48 100644 --- a/runtime/dex_file.cc +++ b/runtime/dex_file.cc @@ -457,9 +457,8 @@ const DexFile::StringId* DexFile::FindStringId(const char* string) const { int32_t hi = NumStringIds() - 1; while (hi >= lo) { int32_t mid = (hi + lo) / 2; - uint32_t length; const DexFile::StringId& str_id = GetStringId(mid); - const char* str = GetStringDataAndUtf16Length(str_id, &length); + const char* str = GetStringData(str_id); int compare = CompareModifiedUtf8ToModifiedUtf8AsUtf16CodePointValues(string, str); if (compare > 0) { lo = mid + 1; @@ -477,9 +476,8 @@ const DexFile::StringId* DexFile::FindStringId(const uint16_t* string) const { int32_t hi = NumStringIds() - 1; while (hi >= lo) { int32_t mid = (hi + lo) / 2; - uint32_t length; const DexFile::StringId& str_id = GetStringId(mid); - const char* str = GetStringDataAndUtf16Length(str_id, &length); + const char* str = GetStringData(str_id); int compare = CompareModifiedUtf8ToUtf16AsCodePointValues(str, string); if (compare > 0) { lo = mid + 1; |