aboutsummaryrefslogtreecommitdiffstats
path: root/minzip/Zip.c
diff options
context:
space:
mode:
authorNanik Tolaram <nanikjava@gmail.com>2015-02-08 22:31:14 +1100
committerNanik Tolaram <nanikjava@gmail.com>2015-02-08 22:31:14 +1100
commit4e8e93b6661f4de86c295b76fff82b8815266780 (patch)
treee1c8501f94120da11578efef343b80679032a699 /minzip/Zip.c
parent6a0d2fbcaa1740da7bb0e7a0ef8280e8b7b9bb05 (diff)
downloadbootable_recovery-4e8e93b6661f4de86c295b76fff82b8815266780.zip
bootable_recovery-4e8e93b6661f4de86c295b76fff82b8815266780.tar.gz
bootable_recovery-4e8e93b6661f4de86c295b76fff82b8815266780.tar.bz2
Remove dead/unused code and realign some of the comments
to make it more cleaner and easier to read Change-Id: If536d482c0ed645368084e76d8ec060f05d89137 Signed-off-by: Nanik Tolaram <nanikjava@gmail.com>
Diffstat (limited to 'minzip/Zip.c')
-rw-r--r--minzip/Zip.c16
1 files changed, 6 insertions, 10 deletions
diff --git a/minzip/Zip.c b/minzip/Zip.c
index 5070104..aec35e3 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