Write-blocking cleanup, largely thanks to Colin Percival (cperciva@).

   * If write block size is zero, don't block at all.
     This supports the unusual requirement of applications
     that need "no-delay" writes.
   * Expose _write_finish_entry() to give such applications more
     control over write boundaries.  (Normal applications do not
     need this, as entries are completed automatically.)
   * Correct the type of write callbacks; this is a minor API
     change that does not affect the ABI.
   * Correct the error handling in _write_next_header() around
     completing the previous entry.
   * Correct the documentation for block-size markers:  Remove
     docs for the long-defunct _read_set_block_size(); document
     all of the write block size manipulators.

MFC after: 14 days

1 files changed, 2 insertions, 2 deletions

diff --git a/lib/libarchive/archive_write_open_fd.c b/lib/libarchive/archive_write_open_fd.c
index 8f979f5..bf4a26b 100644
--- a/lib/libarchive/archive_write_open_fd.c
+++ b/lib/libarchive/archive_write_open_fd.c
@@ -52,7 +52,7 @@ struct write_fd_data {
 
 static int	file_close(struct archive *, void *);
 static int	file_open(struct archive *, void *);
-static ssize_t	file_write(struct archive *, void *, void *buff, size_t);
+static ssize_t	file_write(struct archive *, void *, const void *buff, size_t);
 
 int
 archive_write_open_fd(struct archive *a, int fd)
@@ -108,7 +108,7 @@ file_open(struct archive *a, void *client_data)
 }
 
 static ssize_t
-file_write(struct archive *a, void *client_data, void *buff, size_t length)
+file_write(struct archive *a, void *client_data, const void *buff, size_t length)
 {
 	struct write_fd_data	*mine;
 	ssize_t	bytesWritten;