summaryrefslogtreecommitdiffstats
path: root/minzip
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2014-02-06 03:59:38 +0100
committerAndroid Git Automerger <android-git-automerger@android.com>2014-02-06 03:59:38 +0100
commit2739ed9628f72813d213b7a429c4c1b8dcebe5fc (patch)
tree447fee2410642f9723e34f6eddf8e2d006a3f56b /minzip
parentam f3532072: Merge "minadbd: remove dead code" (diff)
parentMerge "recovery: fix building with pointer-to-int errors turned on" (diff)
downloadandroid_bootable_recovery-2739ed9628f72813d213b7a429c4c1b8dcebe5fc.tar
android_bootable_recovery-2739ed9628f72813d213b7a429c4c1b8dcebe5fc.tar.gz
android_bootable_recovery-2739ed9628f72813d213b7a429c4c1b8dcebe5fc.tar.bz2
android_bootable_recovery-2739ed9628f72813d213b7a429c4c1b8dcebe5fc.tar.lz
android_bootable_recovery-2739ed9628f72813d213b7a429c4c1b8dcebe5fc.tar.xz
android_bootable_recovery-2739ed9628f72813d213b7a429c4c1b8dcebe5fc.tar.zst
android_bootable_recovery-2739ed9628f72813d213b7a429c4c1b8dcebe5fc.zip
Diffstat (limited to 'minzip')
-rw-r--r--minzip/Zip.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/minzip/Zip.c b/minzip/Zip.c
index 439e5d9cd..f4f38a9ff 100644
--- a/minzip/Zip.c
+++ b/minzip/Zip.c
@@ -772,7 +772,7 @@ bool mzReadZipEntry(const ZipArchive* pArchive, const ZipEntry* pEntry,
static bool writeProcessFunction(const unsigned char *data, int dataLen,
void *cookie)
{
- int fd = (int)cookie;
+ int fd = (int)(intptr_t)cookie;
ssize_t soFar = 0;
while (true) {
@@ -802,7 +802,7 @@ bool mzExtractZipEntryToFile(const ZipArchive *pArchive,
const ZipEntry *pEntry, int fd)
{
bool ret = mzProcessZipEntryContents(pArchive, pEntry, writeProcessFunction,
- (void*)fd);
+ (void*)(intptr_t)fd);
if (!ret) {
LOGE("Can't extract entry to file.\n");
return false;