tequilaOS/platform_bootable_recovery
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Delete unused functions from minzip.

Browse source 
This is in preparation of replacing it with libziparchive and
providing shim wrappers.

bug: 19472796
Change-Id: I1f2fb59ee7a41434e794e4ed15b754aa2b74a11d
This commit is contained in:
Narayan Kamath 2015-02-23 13:29:16 +00:00
parent 2d10222509
commit 3e700cff53
2 changed files with 1 additions and 93 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
minzip/Zip.c
View file

@ -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;

51
minzip/Zip.h
View file

@ -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
@ -163,12 +129,6 @@ bool mzProcessZipEntryContents(const ZipArchive *pArchive,
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.
*/
@ -182,17 +142,6 @@ bool mzExtractZipEntryToFile(const ZipArchive *pArchive,
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.