diff options
| author | LibArchive Upstream <libarchive-discuss@googlegroups.com> | 2014-03-18 03:43:07 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-04-03 18:19:12 (GMT) |
| commit | 64713ae3ffddf6fbbfa7ea762c3d756cb245a066 (patch) | |
| tree | 74d1e4b730c28f4cf84bbb558dd337d3d1a3f178 /libarchive/archive_virtual.c | |
| parent | 35df7c8ba8854e97bd6994c4d1143f57535ed6f2 (diff) | |
| download | CMake-64713ae3ffddf6fbbfa7ea762c3d756cb245a066.zip CMake-64713ae3ffddf6fbbfa7ea762c3d756cb245a066.tar.gz CMake-64713ae3ffddf6fbbfa7ea762c3d756cb245a066.tar.bz2 | |
libarchive 3.1.2-218-g00f4bd83 (reduced)
Extract upstream libarchive using the following shell code.
url=git://github.com/libarchive/libarchive.git &&
v=3.1.2-218-g00f4bd83 &&
r=00f4bd83 &&
paths="
CMakeLists.txt
COPYING
CTestConfig.cmake
build/cmake
build/pkgconfig
build/utils
build/version
libarchive/*.*
" &&
mkdir libarchive-$v-g$r-reduced &&
git clone $url libarchive-git &&
date=$(cd libarchive-git && git log -n 1 --format='%cd' $r) &&
(cd libarchive-git && git archive --format=tar $r -- $paths) |
(cd libarchive-$v-g$r-reduced && tar xv) &&
fromdos libarchive-$v-g$r-reduced/build/cmake/Find*.cmake &&
echo "g$r date: $date"
Diffstat (limited to 'libarchive/archive_virtual.c')
| -rw-r--r-- | libarchive/archive_virtual.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/libarchive/archive_virtual.c b/libarchive/archive_virtual.c index 0c4155f..de2595a 100644 --- a/libarchive/archive_virtual.c +++ b/libarchive/archive_virtual.c @@ -55,6 +55,14 @@ archive_filter_bytes(struct archive *a, int n) } int +archive_free(struct archive *a) +{ + if (a == NULL) + return (ARCHIVE_OK); + return ((a->vtable->archive_free)(a)); +} + +int archive_write_close(struct archive *a) { return ((a->vtable->archive_close)(a)); @@ -76,9 +84,7 @@ archive_write_fail(struct archive *a) int archive_write_free(struct archive *a) { - if (a == NULL) - return (ARCHIVE_OK); - return ((a->vtable->archive_free)(a)); + return archive_free(a); } #if ARCHIVE_VERSION_NUMBER < 4000000 @@ -93,9 +99,7 @@ archive_write_finish(struct archive *a) int archive_read_free(struct archive *a) { - if (a == NULL) - return (ARCHIVE_OK); - return ((a->vtable->archive_free)(a)); + return archive_free(a); } #if ARCHIVE_VERSION_NUMBER < 4000000 |