svn commit: r201108 - head/lib/libarchive

[Tim Kientzle]

Author: kientzle
Date: Mon Dec 28 03:28:21 2009
New Revision: 201108
URL: http://svn.freebsd.org/changeset/base/201108

Log:
  Fix some unused variables and dead assignments.

Modified:
  head/lib/libarchive/archive_read_support_compression_bzip2.c
  head/lib/libarchive/archive_write_set_compression_xz.c
  head/lib/libarchive/archive_write_set_format_ar.c

Modified: head/lib/libarchive/archive_read_support_compression_bzip2.c
==============================================================================
--- head/lib/libarchive/archive_read_support_compression_bzip2.c	Mon Dec 28 03:25:33 2009	(r201107)
+++ head/lib/libarchive/archive_read_support_compression_bzip2.c	Mon Dec 28 03:28:21 2009	(r201108)
@@ -210,12 +210,11 @@ static ssize_t
 bzip2_filter_read(struct archive_read_filter *self, const void **p)
 {
 	struct private_data *state;
-	size_t read_avail, decompressed;
+	size_t decompressed;
 	const char *read_buf;
 	ssize_t ret;
 
 	state = (struct private_data *)self->data;
-	read_avail = 0;
 
 	if (state->eof) {
 		*p = NULL;
@@ -348,7 +347,7 @@ bzip2_filter_close(struct archive_read_f
 
 	free(state->out_block);
 	free(state);
-	return (ARCHIVE_OK);
+	return (ret);
 }
 
 #endif /* HAVE_BZLIB_H */

Modified: head/lib/libarchive/archive_write_set_compression_xz.c
==============================================================================
--- head/lib/libarchive/archive_write_set_compression_xz.c	Mon Dec 28 03:25:33 2009	(r201107)
+++ head/lib/libarchive/archive_write_set_compression_xz.c	Mon Dec 28 03:28:21 2009	(r201108)
@@ -323,7 +323,6 @@ archive_compressor_xz_finish(struct arch
 		block_length = state->stream.next_out - state->compressed;
 
 		/* Tricky calculation to determine size of last block. */
-		target_block_length = block_length;
 		if (a->bytes_in_last_block <= 0)
 			/* Default or Zero: pad to full block */
 			target_block_length = a->bytes_per_block;

Modified: head/lib/libarchive/archive_write_set_format_ar.c
==============================================================================
--- head/lib/libarchive/archive_write_set_format_ar.c	Mon Dec 28 03:25:33 2009	(r201107)
+++ head/lib/libarchive/archive_write_set_format_ar.c	Mon Dec 28 03:28:21 2009	(r201108)
@@ -145,7 +145,6 @@ archive_write_ar_header(struct archive_w
 	const char *filename;
 	int64_t size;
 
-	ret = 0;
 	append_fn = 0;
 	ar = (struct ar_w *)a->format_data;
 	ar->is_strtab = 0;