diff options
| author | 2014-10-01 23:34:43 -0700 | |
|---|---|---|
| committer | 2014-10-01 23:35:41 -0700 | |
| commit | 8daabceb2efddebe2e7c0b2425ad9f8ef62c0a5c (patch) | |
| tree | 230e918cee633aa61318edf50e902c44e4a84fde /tools/aapt/ZipFile.cpp | |
| parent | 9f905f37b229294753ef08ee104a00f611de450f (diff) | |
| parent | 1dcc75b2dbaef7c3bb3410187bf38cabca0d1aea (diff) | |
resolved conflicts for merge of 1dcc75b2 to lmp-dev-plus-aosp
Change-Id: I8e1c6ee2025b6acd90803545fb95ab1b98560d92
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); |