diff options
| author | 2014-10-01 22:03:58 -0700 | |
|---|---|---|
| committer | 2014-10-01 23:26:06 -0700 | |
| commit | 87332a7109610d02ac7f5db6af99d3a11813d5c1 (patch) | |
| tree | 19696ad7c6d520eeaff870636aa953a96adcc530 /tools/aapt/ZipFile.cpp | |
| parent | bee6dfe09d4381f9ddf666fd04012c662f31e7fd (diff) | |
| parent | 1dcc75b2dbaef7c3bb3410187bf38cabca0d1aea (diff) | |
resolved conflicts for merge of 1dcc75b2 to lmp-mr1-dev-plus-aosp
Change-Id: I8f7cbd971beae3ab134195e612d705860665142f
Diffstat (limited to 'tools/aapt/ZipFile.cpp')
| -rw-r--r-- | tools/aapt/ZipFile.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tools/aapt/ZipFile.cpp b/tools/aapt/ZipFile.cpp index 8057068dd685..36f4e73b3ac2 100644 --- a/tools/aapt/ZipFile.cpp +++ b/tools/aapt/ZipFile.cpp @@ -676,8 +676,6 @@ status_t ZipFile::copyFpToFp(FILE* dstFp, FILE* srcFp, unsigned long* pCRC32) status_t ZipFile::copyDataToFp(FILE* dstFp, const void* data, size_t size, unsigned long* pCRC32) { - size_t count; - *pCRC32 = crc32(0L, Z_NULL, 0); if (size > 0) { *pCRC32 = crc32(*pCRC32, (const unsigned char*)data, size); |