diff options
author | Narayan Kamath <narayan@google.com> | 2015-02-23 13:29:16 +0000 |
---|---|---|
committer | Narayan Kamath <narayan@google.com> | 2015-02-23 13:29:16 +0000 |
commit | 3e700cff53c0fdd4de2a0f89ef7916f05a131351 (patch) | |
tree | d6da1cdcb05a623f988e01fb590a006fbfeb2092 /minzip/Zip.c | |
parent | 2d1022250941873f8748e6a159d4e5bf976e511f (diff) | |
download | bootable_recovery-3e700cff53c0fdd4de2a0f89ef7916f05a131351.zip bootable_recovery-3e700cff53c0fdd4de2a0f89ef7916f05a131351.tar.gz bootable_recovery-3e700cff53c0fdd4de2a0f89ef7916f05a131351.tar.bz2 |
Delete unused functions from minzip.
This is in preparation of replacing it with libziparchive and
providing shim wrappers.
bug: 19472796
Change-Id: I1f2fb59ee7a41434e794e4ed15b754aa2b74a11d
Diffstat (limited to 'minzip/Zip.c')
-rw-r--r-- | minzip/Zip.c | 43 |
1 files changed, 1 insertions, 42 deletions
diff --git a/minzip/Zip.c b/minzip/Zip.c index aec35e3..fb462f4 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; |