ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "libziparchive: fix clang build"

Browse source
This commit is contained in:
Greg Hackmann 2015-04-27 17:16:24 +00:00 • committed by Gerrit Code Review
commit ba5f10a565
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libziparchive/zip_archive.cc
View file

@ -268,8 +268,6 @@ static const int32_t kMmapFailed = -12;
static const int32_t kErrorMessageLowerBound = -13; static const int32_t kErrorMessageLowerBound = -13;
static const char kTempMappingFileName[] = "zip: ExtractFileToFile";
/* /*
* A Read-only Zip archive. * A Read-only Zip archive.
* *
@ -1038,7 +1036,6 @@ class FileWriter : public Writer {
// Keep track of the start position so we can calculate the // Keep track of the start position so we can calculate the
// total number of bytes written. // total number of bytes written.
const uint8_t* const start = buf; const uint8_t* const start = buf;
size_t bytes_written = 0;
while (buf_size > 0) { while (buf_size > 0) {
ssize_t bytes_written = TEMP_FAILURE_RETRY(write(fd_, buf, buf_size)); ssize_t bytes_written = TEMP_FAILURE_RETRY(write(fd_, buf, buf_size));
if (bytes_written == -1) { if (bytes_written == -1) {
@ -1122,7 +1119,6 @@ static int32_t InflateEntryToWriter(int fd, const ZipEntry* entry,
const uint32_t uncompressed_length = entry->uncompressed_length; const uint32_t uncompressed_length = entry->uncompressed_length;
uint32_t compressed_length = entry->compressed_length; uint32_t compressed_length = entry->compressed_length;
uint32_t write_count = 0;
do { do {
/* read as much as we can */ /* read as much as we can */
if (zstream.avail_in == 0) { if (zstream.avail_in == 0) {