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_data.3 | |
| 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_data.3')
| -rw-r--r-- | Utilities/cmlibarchive/libarchive/archive_read_data.3 | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/Utilities/cmlibarchive/libarchive/archive_read_data.3 b/Utilities/cmlibarchive/libarchive/archive_read_data.3 index a5898e7..78d0497 100644 --- a/Utilities/cmlibarchive/libarchive/archive_read_data.3 +++ b/Utilities/cmlibarchive/libarchive/archive_read_data.3 @@ -25,15 +25,12 @@ .\" $FreeBSD$ .\" .Dd March 22, 2011 -.Dt archive_read_data 3 +.Dt ARCHIVE_READ_DATA 3 .Os .Sh NAME .Nm archive_read_data .Nm archive_read_data_block , .Nm archive_read_data_skip , -.\" #if ARCHIVE_API_VERSION < 3 -.Nm archive_read_data_into_buffer , -.\" #endif .Nm archive_read_data_into_fd .Nd functions for reading streaming archives .Sh SYNOPSIS @@ -49,10 +46,6 @@ .Fc .Ft int .Fn archive_read_data_skip "struct archive *" -.\" #if ARCHIVE_API_VERSION < 3 -.Ft int -.Fn archive_read_data_into_buffer "struct archive *" "void *" "ssize_t len" -.\" #endif .Ft int .Fn archive_read_data_into_fd "struct archive *" "int fd" .\" @@ -84,13 +77,6 @@ to skip all of the data for this archive entry. Note that this function is invoked automatically by .Fn archive_read_next_header2 if the previous entry was not completely consumed. -.\" #if ARCHIVE_API_VERSION < 3 -.It Fn archive_read_data_into_buffer -This function is deprecated and will be removed. -Use -.Fn archive_read_data -instead. -.\" #endif .It Fn archive_read_data_into_fd A convenience function that repeatedly calls .Fn archive_read_data_block |