]> git.ipfire.org Git - thirdparty/libarchive.git/commit
Merge branch 'patch-1' of https://github.com/vlovich/libarchive into vlovich-patch-1
authorTim Kientzle <kientzle@acm.org>
Sun, 14 Dec 2014 18:50:09 +0000 (10:50 -0800)
committerTim Kientzle <kientzle@acm.org>
Sun, 14 Dec 2014 18:50:09 +0000 (10:50 -0800)
commitc98f832267565c5f50a1701dca493d192210345f
tree23fb041e144a02f7d7a70dc1810be6c4328a4eb6
parentaa15869418e9da2b91a50cfe3615b44f21e1781a
parent7064699bec27f7e84295363d0dcd466124220631
Merge branch 'patch-1' of https://github.com/vlovich/libarchive into vlovich-patch-1

Conflicts:
libarchive/archive_write_set_format_zip.c

This was originally submitted as:
   https://github.com/libarchive/libarchive/pull/84

I've made the following corrections:
   * Added a new variable for the deflate compression level (the submitted patch mis-used the requested_compression variable)
   * Extended the Zip store format test to also verify correct results with compression-level=0

TODO: This really needs a new test to exercises non-zero compression-level options.
libarchive/archive_write_set_format_zip.c
libarchive/test/test_write_format_zip_compression_store.c