diff options
author | Nick Kralevich <nnk@google.com> | 2015-02-08 16:20:50 +0100 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-08 16:20:50 +0100 |
commit | ec5c1c1e291062576925b80b532d36df118103f5 (patch) | |
tree | a329cbb5c46df853065a18d54b5c2f24fdb22e2e /minzip/Zip.c | |
parent | am 6a0d2fbc: Merge "There\'s no GPL code in \'updater\'." (diff) | |
parent | Merge "Remove dead/unused code and realign some of the comments to make it more cleaner and easier to read" (diff) | |
download | android_bootable_recovery-ec5c1c1e291062576925b80b532d36df118103f5.tar android_bootable_recovery-ec5c1c1e291062576925b80b532d36df118103f5.tar.gz android_bootable_recovery-ec5c1c1e291062576925b80b532d36df118103f5.tar.bz2 android_bootable_recovery-ec5c1c1e291062576925b80b532d36df118103f5.tar.lz android_bootable_recovery-ec5c1c1e291062576925b80b532d36df118103f5.tar.xz android_bootable_recovery-ec5c1c1e291062576925b80b532d36df118103f5.tar.zst android_bootable_recovery-ec5c1c1e291062576925b80b532d36df118103f5.zip |
Diffstat (limited to 'minzip/Zip.c')
-rw-r--r-- | minzip/Zip.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/minzip/Zip.c b/minzip/Zip.c index 70aff00cd..579e5319f 100644 --- a/minzip/Zip.c +++ b/minzip/Zip.c @@ -327,10 +327,6 @@ static bool parseZipArchive(ZipArchive* pArchive) #else pEntry = &pArchive->pEntries[i]; #endif - - //LOGI("%d: localHdr=%d fnl=%d el=%d cl=%d\n", - // i, localHdrOffset, fileNameLen, extraLen, commentLen); - pEntry->fileNameLen = fileNameLen; pEntry->fileName = fileName; @@ -923,8 +919,8 @@ bool mzExtractRecursive(const ZipArchive *pArchive, /* Walk through the entries and extract anything whose path begins * with zpath. -//TODO: since the entries are sorted, binary search for the first match -// and stop after the first non-match. + //TODO: since the entries are sorted, binary search for the first match + // and stop after the first non-match. */ unsigned int i; bool seenMatch = false; @@ -933,10 +929,10 @@ bool mzExtractRecursive(const ZipArchive *pArchive, for (i = 0; i < pArchive->numEntries; i++) { ZipEntry *pEntry = pArchive->pEntries + i; if (pEntry->fileNameLen < zipDirLen) { -//TODO: look out for a single empty directory entry that matches zpath, but -// missing the trailing slash. Most zip files seem to include -// the trailing slash, but I think it's legal to leave it off. -// e.g., zpath "a/b/", entry "a/b", with no children of the entry. + //TODO: look out for a single empty directory entry that matches zpath, but + // missing the trailing slash. Most zip files seem to include + // the trailing slash, but I think it's legal to leave it off. + // e.g., zpath "a/b/", entry "a/b", with no children of the entry. /* No chance of matching. */ #if SORT_ENTRIES |