summaryrefslogtreecommitdiffstats
path: root/minzip
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2014-02-06 04:07:48 +0100
committerAndroid Git Automerger <android-git-automerger@android.com>2014-02-06 04:07:48 +0100
commit707d321a8745accf4660bf77e33f6acb9ce6b779 (patch)
treea2f4f8069718c1f933e3b4e588bd88b6609de60c /minzip
parentam fd84f65d: am f3532072: Merge "minadbd: remove dead code" (diff)
parentam a5d105e2: Merge "recovery: fix building with pointer-to-int errors turned on" (diff)
downloadandroid_bootable_recovery-707d321a8745accf4660bf77e33f6acb9ce6b779.tar
android_bootable_recovery-707d321a8745accf4660bf77e33f6acb9ce6b779.tar.gz
android_bootable_recovery-707d321a8745accf4660bf77e33f6acb9ce6b779.tar.bz2
android_bootable_recovery-707d321a8745accf4660bf77e33f6acb9ce6b779.tar.lz
android_bootable_recovery-707d321a8745accf4660bf77e33f6acb9ce6b779.tar.xz
android_bootable_recovery-707d321a8745accf4660bf77e33f6acb9ce6b779.tar.zst
android_bootable_recovery-707d321a8745accf4660bf77e33f6acb9ce6b779.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 6752bced5..6785d4ea7 100644
--- a/minzip/Zip.c
+++ b/minzip/Zip.c
@@ -697,7 +697,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) {
@@ -727,7 +727,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;