summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorPiotr Jastrzebski <haaawk@google.com>2014-08-13 10:02:23 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-08-13 10:02:23 +0000
commitd5d04be07fd89af8ee6e6fd1d9bd262b9eadc71b (patch)
tree60ce37ef352a7f8ed67ae1a3b78a8911e31d23c1 /include
parent8b4a58e1dfd8a1f59a7c436954028449a86a0d4e (diff)
parentfa41212789a068827edc9fd1eac7b6a988cba0a5 (diff)
downloadsystem_core-d5d04be07fd89af8ee6e6fd1d9bd262b9eadc71b.zip
system_core-d5d04be07fd89af8ee6e6fd1d9bd262b9eadc71b.tar.gz
system_core-d5d04be07fd89af8ee6e6fd1d9bd262b9eadc71b.tar.bz2
am fa412127: am b242ad40: Merge "Revert "Make sure that names of all entries have the same encoding.""
* commit 'fa41212789a068827edc9fd1eac7b6a988cba0a5': Revert "Make sure that names of all entries have the same encoding."
Diffstat (limited to 'include')
-rw-r--r--include/ziparchive/zip_archive.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/include/ziparchive/zip_archive.h b/include/ziparchive/zip_archive.h
index afd2b7e..27a9796 100644
--- a/include/ziparchive/zip_archive.h
+++ b/include/ziparchive/zip_archive.h
@@ -158,11 +158,6 @@ int32_t Next(void* cookie, ZipEntry* data, ZipEntryName *name);
void EndIteration(void* cookie);
/*
- * Whether entry names in an archive are encoded in UTF-8.
- */
-bool HasUTF8Names(const ZipArchiveHandle handle);
-
-/*
* 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