diff options
| author | Narayan Kamath <narayan@google.com> | 2013-12-18 11:59:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-12-18 11:59:16 +0000 |
| commit | 254d5a292272ef9352505eca98e08200c75bb042 (patch) | |
| tree | ee9b9677d92e604bad95a0efd9db7f91628d87b6 /libdex/CmdUtils.cpp | |
| parent | a2014f266254027e61ce9f89ad07ab83bd165cec (diff) | |
| parent | 39e8b7e287742ea1e1af58d6b25e12897cf66632 (diff) | |
| download | android_dalvik-254d5a292272ef9352505eca98e08200c75bb042.tar.gz android_dalvik-254d5a292272ef9352505eca98e08200c75bb042.tar.bz2 android_dalvik-254d5a292272ef9352505eca98e08200c75bb042.zip | |
Merge "Revert "Revert "Use libziparchive for dalvik zip processing."""
Diffstat (limited to 'libdex/CmdUtils.cpp')
| -rw-r--r-- | libdex/CmdUtils.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libdex/CmdUtils.cpp b/libdex/CmdUtils.cpp index ff737a362..bf89444cc 100644 --- a/libdex/CmdUtils.cpp +++ b/libdex/CmdUtils.cpp @@ -40,7 +40,7 @@ UnzipToFileResult dexUnzipToFile(const char* zipFileName, { UnzipToFileResult result = kUTFRSuccess; static const char* kFileToExtract = "classes.dex"; - ZipArchive archive; + ZipArchiveHandle archive; ZipEntry entry; bool unlinkOnFailure = false; int fd = -1; @@ -64,8 +64,7 @@ UnzipToFileResult dexUnzipToFile(const char* zipFileName, unlinkOnFailure = true; - entry = dexZipFindEntry(&archive, kFileToExtract); - if (entry == NULL) { + if (dexZipFindEntry(archive, kFileToExtract, &entry) != 0) { if (!quiet) { fprintf(stderr, "Unable to find '%s' in '%s'\n", kFileToExtract, zipFileName); @@ -74,7 +73,7 @@ UnzipToFileResult dexUnzipToFile(const char* zipFileName, goto bail; } - if (dexZipExtractEntryToFile(&archive, entry, fd) != 0) { + if (dexZipExtractEntryToFile(archive, &entry, fd) != 0) { fprintf(stderr, "Extract of '%s' from '%s' failed\n", kFileToExtract, zipFileName); result = kUTFRBadZip; |