commit 486f67e1701a547d6ae59f3192e682f54cef580c
author Narayan Kamath <narayan@google.com> Tue Aug 16 09:03:04 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Aug 16 09:03:04 2016 +0000
tree 13f81f151e0518eee72890ae2243c841f0cfe998
parent 48b7be0e390ec4d609b8dd4e2bc019fe7f34e1d3
parent 21c25e39a0ceb843c66dc8ac969f6ba6329fb89c

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

Change-Id: Ic1ab5e824dcc2b6a78e8ceb29732185ad5da1987

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);
       }
     }