summaryrefslogtreecommitdiffstats
path: root/Utilities/cmlibarchive/libarchive/archive_options.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'upstream-LibArchive' into update-libarchiveBrad King2017-02-201-2/+9
| | | | | * upstream-LibArchive: LibArchive 2017-02-19 (100ee75a)
* Merge branch 'upstream-LibArchive' into update-libarchiveBrad King2016-05-021-3/+3
| | | | | Resolve conflicts in C code by taking their side. Resolve conflicts in CMake code by integrating the changes.
* Merge branch 'libarchive-upstream' into update-libarchiveBrad King2013-07-311-3/+50
| | | | | | | | | | | Conflicts: Utilities/cmlibarchive/CMakeLists.txt Utilities/cmlibarchive/libarchive/archive.h Utilities/cmlibarchive/libarchive/archive_entry.h Utilities/cmlibarchive/libarchive/archive_read_disk_posix.c Utilities/cmlibarchive/libarchive/archive_read_support_format_iso9660.c Utilities/cmlibarchive/libarchive/archive_windows.h Utilities/cmlibarchive/libarchive/archive_write_set_format_iso9660.c
* libarchive: Avoid bogus conversion warning from PGI compilerBrad King2012-01-041-3/+3
| | | | | | | | | | | | | | | | | | | | We cannot suppress PGI compiler warnings completely because even with the "-w" flag the compiler still writes a message containing "compilation completed with warnings" to stderr. A warning is triggered by expressions like test ? NULL : ptr_to_const_char test ? ".." : ptr_to_const_char that the PGI compiler handles incorrectly. It chooses the pointer type of the first option (either void* or char*) and warns about conversion of the second without a cast. Flip the expression logic to !test ? ptr_to_const_char : NULL !test ? ptr_to_const_char : ".." to help the compiler choose the proper result type.
* Merge branch 'libarchive-upstream' into update-libarchiveBrad King2011-12-201-0/+164
Add Utilities/cmlibarchive using upstream libarchive 3.0.0-r3950 snapshot.