commit d5d79e01301228d83ce29d221dc0eb42b0dee7cb
author Narayan Kamath <narayan@google.com> Tue Aug 16 09:07:03 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Aug 16 09:07:03 2016 +0000
tree 9df84d417a08d0e09c43413f3eb0d10b80a0c195
parent f1ad0c47b44fe606067c4a698926814d0a070de1
parent 486f67e1701a547d6ae59f3192e682f54cef580c

Merge "zip_archive: Improve error message on fallocate failure." am: 704d818ec1
am: 388a65d146

Change-Id: I2d76efca553e73cd1149825a446d2518e04086b7

libziparchive/zip_archive.cc

diff --git a/libziparchive/zip_archive.cc b/libziparchive/zip_archive.cc
index 1f27500..350be31 100644
--- a/libziparchive/zip_archive.cc
+++ b/libziparchive/zip_archive.cc
@@ -825,8 +825,9 @@
       // disk does not have enough space.
       result = TEMP_FAILURE_RETRY(fallocate(fd, 0, current_offset, declared_length));
       if (result == -1 && errno == ENOSPC) {
-        ALOGW("Zip: unable to allocate space for file to %" PRId64 ": %s",
-              static_cast<int64_t>(declared_length + current_offset), strerror(errno));
+        ALOGW("Zip: unable to allocate  %" PRId64 " bytes at offset %" PRId64 " : %s",
+              static_cast<int64_t>(declared_length), static_cast<int64_t>(current_offset),
+              strerror(errno));
         return std::unique_ptr<FileWriter>(nullptr);
       }
     }