diff options
| author | Piotr Jastrzebski <haaawk@google.com> | 2014-08-18 09:12:33 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-18 09:12:33 +0000 |
| commit | bb684af352deca3c885f30dba8fa68f95f873c7c (patch) | |
| tree | f03717df67d994cd1c8812a13fb6bdbe93c012cc /luni | |
| parent | 1f31b1d98513ce49ae4c702376874e2f6ef37139 (diff) | |
| parent | 7dac4d2883ccce4ec47e86d8681a942ff1262932 (diff) | |
| download | libcore-bb684af352deca3c885f30dba8fa68f95f873c7c.zip libcore-bb684af352deca3c885f30dba8fa68f95f873c7c.tar.gz libcore-bb684af352deca3c885f30dba8fa68f95f873c7c.tar.bz2 | |
am 7dac4d28: Merge "Update ziparchive usage to the new API."
* commit '7dac4d2883ccce4ec47e86d8681a942ff1262932':
Update ziparchive usage to the new API.
Diffstat (limited to 'luni')
| -rw-r--r-- | luni/src/main/native/java_util_jar_StrictJarFile.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/luni/src/main/native/java_util_jar_StrictJarFile.cpp b/luni/src/main/native/java_util_jar_StrictJarFile.cpp index e22e832..b10ec43 100644 --- a/luni/src/main/native/java_util_jar_StrictJarFile.cpp +++ b/luni/src/main/native/java_util_jar_StrictJarFile.cpp @@ -100,8 +100,9 @@ static jlong StrictJarFile_nativeStartIteration(JNIEnv* env, jobject, jlong nati error = StartIteration(reinterpret_cast<ZipArchiveHandle>(nativeHandle), handle->CookieAddress(), NULL); } else { + ZipEntryName entry_name(prefixChars.c_str()); error = StartIteration(reinterpret_cast<ZipArchiveHandle>(nativeHandle), - handle->CookieAddress(), prefixChars.c_str()); + handle->CookieAddress(), &entry_name); } if (error) { @@ -140,7 +141,7 @@ static jobject StrictJarFile_nativeFindEntry(JNIEnv* env, jobject, jlong nativeH ZipEntry data; const int32_t error = FindEntry(reinterpret_cast<ZipArchiveHandle>(nativeHandle), - entryNameChars.c_str(), &data); + ZipEntryName(entryNameChars.c_str()), &data); if (error) { return NULL; } |