diff options
| author | Brad King <brad.king@kitware.com> | 2012-01-05 14:02:58 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2012-01-05 14:02:58 (GMT) |
| commit | 156cb3bbf257f747672eac945fa2e19d33fc3a63 (patch) | |
| tree | a411d9b89fb1ad0960b5baf76ca0ff752acf6fa9 /Utilities/cmlibarchive/libarchive/archive_read.c | |
| parent | fd42bf1bdcb95615dd725ae588db02b22a3aebaa (diff) | |
| parent | 4f4fe6e50bb3dbe59f9bc3cc848cbd07dead324d (diff) | |
| download | CMake-156cb3bbf257f747672eac945fa2e19d33fc3a63.zip CMake-156cb3bbf257f747672eac945fa2e19d33fc3a63.tar.gz CMake-156cb3bbf257f747672eac945fa2e19d33fc3a63.tar.bz2 | |
Merge branch 'libarchive-upstream' into update-libarchive
Conflicts:
Utilities/cmlibarchive/CMakeLists.txt
Utilities/cmlibarchive/libarchive/archive_windows.c
Diffstat (limited to 'Utilities/cmlibarchive/libarchive/archive_read.c')
| -rw-r--r-- | Utilities/cmlibarchive/libarchive/archive_read.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/Utilities/cmlibarchive/libarchive/archive_read.c b/Utilities/cmlibarchive/libarchive/archive_read.c index 6d7f263..baf9dc4 100644 --- a/Utilities/cmlibarchive/libarchive/archive_read.c +++ b/Utilities/cmlibarchive/libarchive/archive_read.c @@ -668,22 +668,6 @@ archive_read_data(struct archive *_a, void *buff, size_t s) return (bytes_read); } -#if ARCHIVE_API_VERSION < 3 -/* - * Obsolete function provided for compatibility only. Note that the API - * of this function doesn't allow the caller to detect if the remaining - * data from the archive entry is shorter than the buffer provided, or - * even if an error occurred while reading data. - */ -int -archive_read_data_into_buffer(struct archive *a, void *d, ssize_t len) -{ - - archive_read_data(a, d, len); - return (ARCHIVE_OK); -} -#endif - /* * Skip over all remaining data in this entry. */ |