Fix some unused variables and dead assignments.

This commit is contained in:
Tim Kientzle 2009-12-28 03:28:21 +00:00
parent 108f9d8324
commit f773eba566
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=201108
3 changed files with 2 additions and 5 deletions

View File

@ -210,12 +210,11 @@ static ssize_t
bzip2_filter_read(struct archive_read_filter *self, const void **p) bzip2_filter_read(struct archive_read_filter *self, const void **p)
{ {
struct private_data *state; struct private_data *state;
size_t read_avail, decompressed; size_t decompressed;
const char *read_buf; const char *read_buf;
ssize_t ret; ssize_t ret;
state = (struct private_data *)self->data; state = (struct private_data *)self->data;
read_avail = 0;
if (state->eof) { if (state->eof) {
*p = NULL; *p = NULL;
@ -348,7 +347,7 @@ bzip2_filter_close(struct archive_read_filter *self)
free(state->out_block); free(state->out_block);
free(state); free(state);
return (ARCHIVE_OK); return (ret);
} }
#endif /* HAVE_BZLIB_H */ #endif /* HAVE_BZLIB_H */

View File

@ -323,7 +323,6 @@ archive_compressor_xz_finish(struct archive_write *a)
block_length = state->stream.next_out - state->compressed; block_length = state->stream.next_out - state->compressed;
/* Tricky calculation to determine size of last block. */ /* Tricky calculation to determine size of last block. */
target_block_length = block_length;
if (a->bytes_in_last_block <= 0) if (a->bytes_in_last_block <= 0)
/* Default or Zero: pad to full block */ /* Default or Zero: pad to full block */
target_block_length = a->bytes_per_block; target_block_length = a->bytes_per_block;

View File

@ -145,7 +145,6 @@ archive_write_ar_header(struct archive_write *a, struct archive_entry *entry)
const char *filename; const char *filename;
int64_t size; int64_t size;
ret = 0;
append_fn = 0; append_fn = 0;
ar = (struct ar_w *)a->format_data; ar = (struct ar_w *)a->format_data;
ar->is_strtab = 0; ar->is_strtab = 0;