From 1c4ceae38f3fd7eb1e451d430acb5d99f257b0f9 Mon Sep 17 00:00:00 2001
From: Doug Zongker <dougz@android.com>
Date: Fri, 8 May 2009 09:43:28 -0700
Subject: 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.
---
 minzip/Zip.h | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'minzip/Zip.h')

diff --git a/minzip/Zip.h b/minzip/Zip.h
index 57c0abd2c..1c1df2fae 100644
--- a/minzip/Zip.h
+++ b/minzip/Zip.h
@@ -55,14 +55,6 @@ typedef struct {
     size_t len;
 } UnterminatedString;
 
-/*
- * The information we pass down to writeProcessFunction.
- */
-typedef struct {
-    int fd;
-    unsigned char* aligned_buffer;
-} WriteInfo;
-
 /*
  * Open a Zip archive.
  *
@@ -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
-- 
cgit v1.2.3