diff options
author | Narayan Kamath <narayan@google.com> | 2015-02-24 14:25:06 +0100 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-24 14:25:06 +0100 |
commit | 218dab7fdafbc613aa54d1fad0de0dcadd575186 (patch) | |
tree | 3a25aecea25432046d2fd56ebe26741514d4af80 | |
parent | am f9ee77ab: am 9e95c515: Merge "Fix a printf format warning." (diff) | |
parent | am 829d392a: Merge "Delete unused functions from minzip." (diff) | |
download | android_bootable_recovery-218dab7fdafbc613aa54d1fad0de0dcadd575186.tar android_bootable_recovery-218dab7fdafbc613aa54d1fad0de0dcadd575186.tar.gz android_bootable_recovery-218dab7fdafbc613aa54d1fad0de0dcadd575186.tar.bz2 android_bootable_recovery-218dab7fdafbc613aa54d1fad0de0dcadd575186.tar.lz android_bootable_recovery-218dab7fdafbc613aa54d1fad0de0dcadd575186.tar.xz android_bootable_recovery-218dab7fdafbc613aa54d1fad0de0dcadd575186.tar.zst android_bootable_recovery-218dab7fdafbc613aa54d1fad0de0dcadd575186.zip |
Diffstat (limited to '')
-rw-r--r-- | minzip/Zip.c | 43 | ||||
-rw-r--r-- | minzip/Zip.h | 51 |
2 files changed, 1 insertions, 93 deletions
diff --git a/minzip/Zip.c b/minzip/Zip.c index 579e5319f..12e06f6d8 100644 --- a/minzip/Zip.c +++ b/minzip/Zip.c @@ -484,7 +484,7 @@ const ZipEntry* mzFindZipEntry(const ZipArchive* pArchive, /* * Return true if the entry is a symbolic link. */ -bool mzIsZipEntrySymlink(const ZipEntry* pEntry) +static bool mzIsZipEntrySymlink(const ZipEntry* pEntry) { if ((pEntry->versionMadeBy & 0xff00) == CENVEM_UNIX) { return S_ISLNK(pEntry->externalFileAttributes >> 16); @@ -628,30 +628,6 @@ static bool crcProcessFunction(const unsigned char *data, int dataLen, return true; } -/* - * Check the CRC on this entry; return true if it is correct. - * May do other internal checks as well. - */ -bool mzIsZipEntryIntact(const ZipArchive *pArchive, const ZipEntry *pEntry) -{ - unsigned long crc; - bool ret; - - crc = crc32(0L, Z_NULL, 0); - ret = mzProcessZipEntryContents(pArchive, pEntry, crcProcessFunction, - (void *)&crc); - if (!ret) { - LOGE("Can't calculate CRC for entry\n"); - return false; - } - if (crc != (unsigned long)pEntry->crc32) { - LOGW("CRC for entry %.*s (0x%08lx) != expected (0x%08lx)\n", - pEntry->fileNameLen, pEntry->fileName, crc, pEntry->crc32); - return false; - } - return true; -} - typedef struct { char *buf; int bufLen; @@ -733,23 +709,6 @@ bool mzExtractZipEntryToFile(const ZipArchive *pArchive, return true; } -/* - * Obtain a pointer to the in-memory representation of a stored entry. - */ -bool mzGetStoredEntry(const ZipArchive *pArchive, - const ZipEntry *pEntry, unsigned char **addr, size_t *length) -{ - if (pEntry->compression != STORED) { - LOGE("Can't getStoredEntry for '%s'; not stored\n", - pEntry->fileName); - return false; - } - - *addr = pArchive->addr + pEntry->offset; - *length = pEntry->uncompLen; - return true; -} - typedef struct { unsigned char* buffer; long len; diff --git a/minzip/Zip.h b/minzip/Zip.h index 2054b38a4..54eab3222 100644 --- a/minzip/Zip.h +++ b/minzip/Zip.h @@ -92,49 +92,15 @@ INLINE unsigned int mzZipEntryCount(const ZipArchive* pArchive) { return pArchive->numEntries; } -/* - * Get an entry by index. Returns NULL if the index is out-of-bounds. - */ -INLINE const ZipEntry* -mzGetZipEntryAt(const ZipArchive* pArchive, unsigned int index) -{ - if (index < pArchive->numEntries) { - return pArchive->pEntries + index; - } - return NULL; -} - -/* - * Get the index number of an entry in the archive. - */ -INLINE unsigned int -mzGetZipEntryIndex(const ZipArchive *pArchive, const ZipEntry *pEntry) { - return pEntry - pArchive->pEntries; -} - -/* - * Simple accessors. - */ -INLINE UnterminatedString mzGetZipEntryFileName(const ZipEntry* pEntry) { - UnterminatedString ret; - ret.str = pEntry->fileName; - ret.len = pEntry->fileNameLen; - return ret; -} INLINE long mzGetZipEntryOffset(const ZipEntry* pEntry) { return pEntry->offset; } INLINE long mzGetZipEntryUncompLen(const ZipEntry* pEntry) { return pEntry->uncompLen; } -INLINE long mzGetZipEntryModTime(const ZipEntry* pEntry) { - return pEntry->modTime; -} INLINE long mzGetZipEntryCrc32(const ZipEntry* pEntry) { return pEntry->crc32; } -bool mzIsZipEntrySymlink(const ZipEntry* pEntry); - /* * Type definition for the callback function used by @@ -164,12 +130,6 @@ bool mzReadZipEntry(const ZipArchive* pArchive, const ZipEntry* pEntry, char* buf, int bufLen); /* - * Check the CRC on this entry; return true if it is correct. - * May do other internal checks as well. - */ -bool mzIsZipEntryIntact(const ZipArchive *pArchive, const ZipEntry *pEntry); - -/* * Inflate and write an entry to a file. */ bool mzExtractZipEntryToFile(const ZipArchive *pArchive, @@ -183,17 +143,6 @@ bool mzExtractZipEntryToBuffer(const ZipArchive *pArchive, const ZipEntry *pEntry, unsigned char* buffer); /* - * Return a pointer and length for a given entry. The returned region - * should be valid until pArchive is closed, and should be treated as - * read-only. - * - * Only makes sense for entries which are stored (ie, not compressed). - * No guarantees are made regarding alignment of the returned pointer. - */ -bool mzGetStoredEntry(const ZipArchive *pArchive, - const ZipEntry* pEntry, unsigned char **addr, size_t *length); - -/* * Inflate all entries under zipDir to the directory specified by * targetDir, which must exist and be a writable directory. * |