aboutsummaryrefslogtreecommitdiffstats
path: root/minzip/Zip.h
diff options
context:
space:
mode:
authorDoug Zongker <dougz@android.com>2009-05-08 09:43:28 -0700
committerDoug Zongker <dougz@android.com>2009-05-08 09:43:28 -0700
commit1c4ceae38f3fd7eb1e451d430acb5d99f257b0f9 (patch)
tree5dbf0392571a64b4afbe0ba73655c889f650eb75 /minzip/Zip.h
parent683c4628039a8cb6dad1a086fae23a7d71438414 (diff)
downloadbootable_recovery-1c4ceae38f3fd7eb1e451d430acb5d99f257b0f9.zip
bootable_recovery-1c4ceae38f3fd7eb1e451d430acb5d99f257b0f9.tar.gz
bootable_recovery-1c4ceae38f3fd7eb1e451d430acb5d99f257b0f9.tar.bz2
undo temporary alignment hack
Remove the memory alignment that mysteriously made OTA installs work, in anticipation of a kernel that fixes the actual problem. Handle EINTR properly.
Diffstat (limited to 'minzip/Zip.h')
-rw-r--r--minzip/Zip.h10
1 files changed, 1 insertions, 9 deletions
diff --git a/minzip/Zip.h b/minzip/Zip.h
index 57c0abd..1c1df2f 100644
--- a/minzip/Zip.h
+++ b/minzip/Zip.h
@@ -56,14 +56,6 @@ typedef struct {
} UnterminatedString;
/*
- * The information we pass down to writeProcessFunction.
- */
-typedef struct {
- int fd;
- unsigned char* aligned_buffer;
-} WriteInfo;
-
-/*
* Open a Zip archive.
*
* On success, returns 0 and populates "pArchive". Returns nonzero errno
@@ -174,7 +166,7 @@ bool mzIsZipEntryIntact(const ZipArchive *pArchive, const ZipEntry *pEntry);
* Inflate and write an entry to a file.
*/
bool mzExtractZipEntryToFile(const ZipArchive *pArchive,
- const ZipEntry *pEntry, WriteInfo *wi);
+ const ZipEntry *pEntry, int fd);
/*
* Inflate all entries under zipDir to the directory specified by