summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Hackmann2015-04-27 12:14:32 -0500
committerElliott Hughes2015-06-04 15:26:12 -0500
commit4ba18cf3ffae39c86ef3c968871b331f1e7df914 (patch)
treed4fffdd82f6a216434c3a6c794d4932c8f002ffe /libziparchive/zip_archive.cc
parent785a128aec74dc7bee7d76adafa69c94a4b268aa (diff)
downloadplatform-system-core-4ba18cf3ffae39c86ef3c968871b331f1e7df914.tar.gz
platform-system-core-4ba18cf3ffae39c86ef3c968871b331f1e7df914.tar.xz
platform-system-core-4ba18cf3ffae39c86ef3c968871b331f1e7df914.zip
libziparchive: fix clang build
Bug: http://b/21558406 Change-Id: I69105a9cde05b182f65c7e574282bb4b48b66e95 Signed-off-by: Greg Hackmann <ghackmann@google.com> (cherry picked from commit d6eac24aac0069cb6d00d2c723db5adab1a724c4)
Diffstat (limited to 'libziparchive/zip_archive.cc')
-rw-r--r--libziparchive/zip_archive.cc4
1 files changed, 0 insertions, 4 deletions
diff --git a/libziparchive/zip_archive.cc b/libziparchive/zip_archive.cc
index 4ba91dfb9..34131f1be 100644
--- a/libziparchive/zip_archive.cc
+++ b/libziparchive/zip_archive.cc
@@ -268,8 +268,6 @@ static const int32_t kMmapFailed = -12;
268 268
269static const int32_t kErrorMessageLowerBound = -13; 269static const int32_t kErrorMessageLowerBound = -13;
270 270
271static const char kTempMappingFileName[] = "zip: ExtractFileToFile";
272
273/* 271/*
274 * A Read-only Zip archive. 272 * A Read-only Zip archive.
275 * 273 *
@@ -1038,7 +1036,6 @@ class FileWriter : public Writer {
1038 // Keep track of the start position so we can calculate the 1036 // Keep track of the start position so we can calculate the
1039 // total number of bytes written. 1037 // total number of bytes written.
1040 const uint8_t* const start = buf; 1038 const uint8_t* const start = buf;
1041 size_t bytes_written = 0;
1042 while (buf_size > 0) { 1039 while (buf_size > 0) {
1043 ssize_t bytes_written = TEMP_FAILURE_RETRY(write(fd_, buf, buf_size)); 1040 ssize_t bytes_written = TEMP_FAILURE_RETRY(write(fd_, buf, buf_size));
1044 if (bytes_written == -1) { 1041 if (bytes_written == -1) {
@@ -1122,7 +1119,6 @@ static int32_t InflateEntryToWriter(int fd, const ZipEntry* entry,
1122 const uint32_t uncompressed_length = entry->uncompressed_length; 1119 const uint32_t uncompressed_length = entry->uncompressed_length;
1123 1120
1124 uint32_t compressed_length = entry->compressed_length; 1121 uint32_t compressed_length = entry->compressed_length;
1125 uint32_t write_count = 0;
1126 do { 1122 do {
1127 /* read as much as we can */ 1123 /* read as much as we can */
1128 if (zstream.avail_in == 0) { 1124 if (zstream.avail_in == 0) {