From fbe2bd372f402454489fa831e11359cc657b055c Mon Sep 17 00:00:00 2001 From: Pawan Wagh Date: Mon, 3 Jun 2024 21:39:07 +0000 Subject: Combine ZipFileRO::getEntryInfo Removing getEntryInfo which doesn't contain extra field size and fixing the usage. Test: mma libandroidfw Bug: 334109171 Change-Id: Id5c8a5405265e6964f5b56b253430eb7c49cdc02 --- libs/androidfw/ZipFileRO.cpp | 8 -------- 1 file changed, 8 deletions(-) (limited to 'libs/androidfw/ZipFileRO.cpp') diff --git a/libs/androidfw/ZipFileRO.cpp b/libs/androidfw/ZipFileRO.cpp index 839c7b6fef37..10651cdaff33 100644 --- a/libs/androidfw/ZipFileRO.cpp +++ b/libs/androidfw/ZipFileRO.cpp @@ -118,14 +118,6 @@ ZipEntryRO ZipFileRO::findEntryByName(const char* entryName) const * Returns "false" if the offsets to the fields or the contents of the fields * appear to be bogus. */ -bool ZipFileRO::getEntryInfo(ZipEntryRO entry, uint16_t* pMethod, - uint32_t* pUncompLen, uint32_t* pCompLen, off64_t* pOffset, - uint32_t* pModWhen, uint32_t* pCrc32) const -{ - return getEntryInfo(entry, pMethod, pUncompLen, pCompLen, pOffset, pModWhen, - pCrc32, nullptr); -} - bool ZipFileRO::getEntryInfo(ZipEntryRO entry, uint16_t* pMethod, uint32_t* pUncompLen, uint32_t* pCompLen, off64_t* pOffset, uint32_t* pModWhen, uint32_t* pCrc32, uint16_t* pExtraFieldSize) const -- cgit v1.2.3-59-g8ed1b