diff options
author | Nick Kralevich <nnk@google.com> | 2015-02-08 16:09:00 +0100 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-02-08 16:09:00 +0100 |
commit | 99e084ca8012bc7af52ae2fb9e72ab7180177daf (patch) | |
tree | e1c8501f94120da11578efef343b80679032a699 /minzip/Zip.c | |
parent | Merge "There's no GPL code in 'updater'." (diff) | |
parent | Remove dead/unused code and realign some of the comments (diff) | |
download | android_bootable_recovery-99e084ca8012bc7af52ae2fb9e72ab7180177daf.tar android_bootable_recovery-99e084ca8012bc7af52ae2fb9e72ab7180177daf.tar.gz android_bootable_recovery-99e084ca8012bc7af52ae2fb9e72ab7180177daf.tar.bz2 android_bootable_recovery-99e084ca8012bc7af52ae2fb9e72ab7180177daf.tar.lz android_bootable_recovery-99e084ca8012bc7af52ae2fb9e72ab7180177daf.tar.xz android_bootable_recovery-99e084ca8012bc7af52ae2fb9e72ab7180177daf.tar.zst android_bootable_recovery-99e084ca8012bc7af52ae2fb9e72ab7180177daf.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 5070104d3..aec35e375 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 |