summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2016-11-15 22:11:21 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-11-15 22:11:21 +0000
commitaf2a8858c4633c060e101ce911d4a8e9b39d9071 (patch)
treeff0ea5bdbcd74c6ef3a40b44967250b2df9133d7 /include
parent3ee9807554c85c1faa7ec70bf46f9e7f84b8c3b6 (diff)
parent787482ecd9658b3078044aa287680b32795c2375 (diff)
downloadsystem_core-af2a8858c4633c060e101ce911d4a8e9b39d9071.tar.gz
system_core-af2a8858c4633c060e101ce911d4a8e9b39d9071.tar.bz2
system_core-af2a8858c4633c060e101ce911d4a8e9b39d9071.zip
Merge "ziparchive: Allow ExtractEntryToFile() to work with block device."
am: 787482ecd9 Change-Id: Icdce4207cb64e084e200b6f7f8ae194831d5c4f0
Diffstat (limited to 'include')
-rw-r--r--include/ziparchive/zip_archive.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/ziparchive/zip_archive.h b/include/ziparchive/zip_archive.h
index fc845a44e..54946fc93 100644
--- a/include/ziparchive/zip_archive.h
+++ b/include/ziparchive/zip_archive.h
@@ -195,7 +195,8 @@ void EndIteration(void* cookie);
* Uncompress and write an entry to an open file identified by |fd|.
* |entry->uncompressed_length| bytes will be written to the file at
* its current offset, and the file will be truncated at the end of
- * the uncompressed data.
+ * the uncompressed data (no truncation if |fd| references a block
+ * device).
*
* Returns 0 on success and negative values on failure.
*/