summaryrefslogtreecommitdiffstats
path: root/minzip/Zip.c
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2015-02-23 14:29:16 +0100
committerNarayan Kamath <narayan@google.com>2015-02-23 14:29:16 +0100
commit3e700cff53c0fdd4de2a0f89ef7916f05a131351 (patch)
treed6da1cdcb05a623f988e01fb590a006fbfeb2092 /minzip/Zip.c
parentMerge "Kill of most of the remainder of minadbd." (diff)
downloadandroid_bootable_recovery-3e700cff53c0fdd4de2a0f89ef7916f05a131351.tar
android_bootable_recovery-3e700cff53c0fdd4de2a0f89ef7916f05a131351.tar.gz
android_bootable_recovery-3e700cff53c0fdd4de2a0f89ef7916f05a131351.tar.bz2
android_bootable_recovery-3e700cff53c0fdd4de2a0f89ef7916f05a131351.tar.lz
android_bootable_recovery-3e700cff53c0fdd4de2a0f89ef7916f05a131351.tar.xz
android_bootable_recovery-3e700cff53c0fdd4de2a0f89ef7916f05a131351.tar.zst
android_bootable_recovery-3e700cff53c0fdd4de2a0f89ef7916f05a131351.zip
Diffstat (limited to '')
-rw-r--r--minzip/Zip.c43
1 files changed, 1 insertions, 42 deletions
diff --git a/minzip/Zip.c b/minzip/Zip.c
index aec35e375..fb462f45c 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;