diff options
author | Nanik Tolaram <nanikjava@gmail.com> | 2015-02-08 12:31:14 +0100 |
---|---|---|
committer | Nanik Tolaram <nanikjava@gmail.com> | 2015-02-08 12:31:14 +0100 |
commit | 4e8e93b6661f4de86c295b76fff82b8815266780 (patch) | |
tree | e1c8501f94120da11578efef343b80679032a699 /minzip | |
parent | Merge "There's no GPL code in 'updater'." (diff) | |
download | android_bootable_recovery-4e8e93b6661f4de86c295b76fff82b8815266780.tar android_bootable_recovery-4e8e93b6661f4de86c295b76fff82b8815266780.tar.gz android_bootable_recovery-4e8e93b6661f4de86c295b76fff82b8815266780.tar.bz2 android_bootable_recovery-4e8e93b6661f4de86c295b76fff82b8815266780.tar.lz android_bootable_recovery-4e8e93b6661f4de86c295b76fff82b8815266780.tar.xz android_bootable_recovery-4e8e93b6661f4de86c295b76fff82b8815266780.tar.zst android_bootable_recovery-4e8e93b6661f4de86c295b76fff82b8815266780.zip |
Diffstat (limited to '')
-rw-r--r-- | minzip/DirUtil.c | 4 | ||||
-rw-r--r-- | minzip/Hash.c | 11 | ||||
-rw-r--r-- | minzip/Zip.c | 16 |
3 files changed, 8 insertions, 23 deletions
diff --git a/minzip/DirUtil.c b/minzip/DirUtil.c index fe2c880ac..97cb2e0ee 100644 --- a/minzip/DirUtil.c +++ b/minzip/DirUtil.c @@ -85,7 +85,7 @@ dirCreateHierarchy(const char *path, int mode, c--; } if (c == cpath) { -//xxx test this path + //xxx test this path /* No directory component. Act like the path was empty. */ errno = ENOENT; @@ -206,7 +206,7 @@ dirUnlinkHierarchy(const char *path) /* recurse over components */ errno = 0; while ((de = readdir(dir)) != NULL) { -//TODO: don't blow the stack + //TODO: don't blow the stack char dn[PATH_MAX]; if (!strcmp(de->d_name, "..") || !strcmp(de->d_name, ".")) { continue; diff --git a/minzip/Hash.c b/minzip/Hash.c index 8c6ca9bc2..8f8ed68e5 100644 --- a/minzip/Hash.c +++ b/minzip/Hash.c @@ -140,7 +140,6 @@ static bool resizeHash(HashTable* pHashTable, int newSize) int i; assert(countTombStones(pHashTable) == pHashTable->numDeadEntries); - //LOGI("before: dead=%d\n", pHashTable->numDeadEntries); pNewEntries = (HashEntry*) calloc(newSize, sizeof(HashTable)); if (pNewEntries == NULL) @@ -196,7 +195,6 @@ void* mzHashTableLookup(HashTable* pHashTable, unsigned int itemHash, void* item (*cmpFunc)(pEntry->data, item) == 0) { /* match */ - //LOGD("+++ match on entry %d\n", pEntry - pHashTable->pEntries); break; } @@ -206,8 +204,6 @@ void* mzHashTableLookup(HashTable* pHashTable, unsigned int itemHash, void* item break; /* edge case - single-entry table */ pEntry = pHashTable->pEntries; } - - //LOGI("+++ look probing %d...\n", pEntry - pHashTable->pEntries); } if (pEntry->data == NULL) { @@ -228,10 +224,6 @@ void* mzHashTableLookup(HashTable* pHashTable, unsigned int itemHash, void* item abort(); } /* note "pEntry" is now invalid */ - } else { - //LOGW("okay %d/%d/%d\n", - // pHashTable->numEntries, pHashTable->tableSize, - // (pHashTable->tableSize * LOAD_NUMER) / LOAD_DENOM); } /* full table is bad -- search for nonexistent never halts */ @@ -264,7 +256,6 @@ bool mzHashTableRemove(HashTable* pHashTable, unsigned int itemHash, void* item) pEnd = &pHashTable->pEntries[pHashTable->tableSize]; while (pEntry->data != NULL) { if (pEntry->data == item) { - //LOGI("+++ stepping on entry %d\n", pEntry - pHashTable->pEntries); pEntry->data = HASH_TOMBSTONE; pHashTable->numEntries--; pHashTable->numDeadEntries++; @@ -277,8 +268,6 @@ bool mzHashTableRemove(HashTable* pHashTable, unsigned int itemHash, void* item) break; /* edge case - single-entry table */ pEntry = pHashTable->pEntries; } - - //LOGI("+++ del probing %d...\n", pEntry - pHashTable->pEntries); } return false; 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 |